From d452398bb4c09ef7f0af059f5ebecaf209a9019c Mon Sep 17 00:00:00 2001
From: Nolen Johnson <johnsonnolen@gmail.com>
Date: Wed, 20 Dec 2023 17:58:51 -0500
Subject: [PATCH] nx: Account for vendor restructure

Change-Id: I880c51ec4bb435f086c36639bd4a036fd243ce1f
---
 BoardConfig.mk             |  2 --
 device.mk                  | 18 +++---------------
 vendor/bcm_firmware/bcm.mk |  2 +-
 vendor/nx-vendor.mk        |  2 +-
 4 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 595e986..d297225 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -38,10 +38,8 @@ DEVICE_MANIFEST_FILE := device/nintendo/nx/manifest.xml
 
 # Bluetooth
 TARGET_VENDOR_PROP += device/nintendo/nx/bluetooth.prop
-ifeq ($(TARGET_TEGRA_BT),bcm)
 BOARD_CUSTOM_BT_CONFIG := device/nintendo/nx/comms/vnd_nx.txt
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/nintendo/nx/comms
-endif
 
 # Charger
 WITH_LINEAGE_CHARGER := false
diff --git a/device.mk b/device.mk
index 7b1ee5f..9a0f452 100644
--- a/device.mk
+++ b/device.mk
@@ -16,16 +16,11 @@
 
 TARGET_TEGRA_VARIANT    ?= common
 
-TARGET_TEGRA_AUDIO    ?= nvaudio
 TARGET_TEGRA_BT       ?= bcm
-TARGET_TEGRA_CEC      ?= aosp
+TARGET_TEGRA_CEC      := aosp
 TARGET_TEGRA_KERNEL   ?= 4.9
 TARGET_TEGRA_KEYSTORE := software
-TARGET_TEGRA_MEMTRACK ?= nvmemtrack
-TARGET_TEGRA_OMX      ?= nvmm
-TARGET_TEGRA_PHS      ?= nvphs
-TARGET_TEGRA_POWER    ?= aosp
-TARGET_TEGRA_WIDEVINE ?= true
+TARGET_TEGRA_WIDEVINE ?= rel-shield-r
 TARGET_TEGRA_WIFI     ?= bcm
 
 TARGET_TEGRA_WIREGUARD ?= compat
@@ -91,12 +86,10 @@ ifeq ($(PRODUCT_IS_ATV),true)
 endif
 
 # Audio
-ifeq ($(TARGET_TEGRA_AUDIO),nvaudio)
 PRODUCT_PACKAGES += \
     audio_effects.xml \
     audio_policy_configuration.xml \
     nvaudio_conf.xml
-endif
 
 # CEC
 PRODUCT_COPY_FILES := $(filter-out frameworks/native/data/etc/android.hardware.hdmi.cec.xml%android.hardware.hdmi.cec.xml,$(PRODUCT_COPY_FILES))
@@ -147,13 +140,10 @@ PRODUCT_COPY_FILES += \
     frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_ODM)/etc/media_codecs_google_audio.xml \
     frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_ODM)/etc/media_codecs_google_video.xml
 PRODUCT_PACKAGES += \
-    media_codecs.xml
-ifneq (,$(findstring nvmm,$(TARGET_TEGRA_OMX)))
-PRODUCT_PACKAGES += \
+    media_codecs.xml \
     media_codecs_performance.xml \
     media_profiles_V1_0.xml \
     enctune.conf
-endif
 
 # Power
 PRODUCT_PACKAGES += \
@@ -164,10 +154,8 @@ PRODUCT_COPY_FILES += \
     system/core/libprocessgroup/profiles/task_profiles_28.json:$(TARGET_COPY_OUT_VENDOR)/etc/task_profiles.json
 
 # PHS
-ifeq ($(TARGET_TEGRA_PHS),nvphs)
 PRODUCT_PACKAGES += \
     nvphsd.conf
-endif
 
 # Sensors
 PRODUCT_PACKAGES += \
diff --git a/vendor/bcm_firmware/bcm.mk b/vendor/bcm_firmware/bcm.mk
index 7868174..fda1dd3 100644
--- a/vendor/bcm_firmware/bcm.mk
+++ b/vendor/bcm_firmware/bcm.mk
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 LOCAL_PATH := device/nintendo/nx/vendor/bcm_firmware
-COMMON_BCM_PATH := device/nvidia/tegra-common/vendor/bcm_firmware
+COMMON_BCM_PATH := device/nvidia/tegra-common/vendor/rel-shield-r/bcm_firmware
 
 PRODUCT_PACKAGES += \
     BCM4356A3 \
diff --git a/vendor/nx-vendor.mk b/vendor/nx-vendor.mk
index f4f6995..b1a2969 100644
--- a/vendor/nx-vendor.mk
+++ b/vendor/nx-vendor.mk
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include device/nvidia/t210-common/vendor/t210.mk
+include device/nvidia/t210-common/vendor/t210-by-flags.mk
 include device/nvidia/tegra-common/vendor/common-by-flags.mk
 include device/nintendo/nx/vendor/bcm_firmware/bcm.mk