[DNM] ACK stuff

Change-Id: I72adcaa0b01ccbf224a9b3e34d5143c24c9d4621

device.mk

@@ -16,25 +16,31 @@
 
 TARGET_TEGRA_VARIANT    ?= common
 
-TARGET_TEGRA_BT       ?= bcm
-TARGET_TEGRA_CAMERA   := rel-shield-r
-TARGET_TEGRA_CEC      := aosp
-TARGET_TEGRA_CPL      := none
 TARGET_KERNEL_VERSION ?= 4.9
 TARGET_TEGRA_KEYSTORE := software
 TARGET_TEGRA_LIGHT    ?= lineage
-TARGET_TEGRA_POWER    := perfmgr
-TARGET_TEGRA_SENSORS  := iio
-TARGET_TEGRA_SENSOR_FEATURES := accelerometer gyroscope light
-TARGET_TEGRA_THERMAL  ?= lineage
+#TARGET_TEGRA_THERMAL  ?= lineage
 TARGET_TEGRA_UBOOT    := prebuilt
-TARGET_TEGRA_WIDEVINE ?= rel-shield-r
-TARGET_TEGRA_WIFI     ?= bcm
+TARGET_TEGRA_POWER    := perfmgr
 
 TARGET_ATV_FORCE_1080_SCALING := false
 
 ifneq ($(filter 4.9, $(TARGET_KERNEL_VERSION)),)
-TARGET_TEGRA_MEMTRACK ?= rel-shield-r
+TARGET_TEGRA_BT        ?= bcm
+TARGET_TEGRA_CAMERA    ?= rel-shield-r
+TARGET_TEGRA_CEC      := aosp
+TARGET_TEGRA_CPL      := none
+TARGET_TEGRA_SENSORS  := iio
+TARGET_TEGRA_SENSOR_FEATURES := accelerometer gyroscope light
+TARGET_TEGRA_WIDEVINE  ?= rel-shield-r
+TARGET_TEGRA_WIFI     ?= bcm
+else
+TARGET_TEGRA_FIRMWARE_BRANCH ?= linux-firmware
+TARGET_AUDIO_HAL := baylibre
+TARGET_TV_HDMI_CEC_HAL :=
+PRODUCT_COPY_FILES += \
+    device/nintendo/nx/initfiles/ack.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/ack.rc \
+    device/nintendo/nx/initfiles/init.recovery.ack.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.ack.rc
 endif
 
 include device/nvidia/t210-common/t210.mk
@@ -48,7 +54,7 @@ else
 PRODUCT_CHARACTERISTICS   := tablet
 endif
 
-PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := true
+PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false
 
 $(call inherit-product, frameworks/native/build/tablet-7in-xhdpi-2048-dalvik-heap.mk)
 
@@ -78,10 +84,21 @@ PRODUCT_PACKAGES += \
     init.sensors.nx.rc \
     init.vali.rc
 
+ifneq ($(filter 4.9 5.10, $(TARGET_KERNEL_VERSION)),)
 ifneq ($(TARGET_TEGRA_CPL),none)
 PRODUCT_PACKAGES += \
     power.nx.rc
 endif
+endif
+
+ifeq ($(TARGET_POWER_HAL),perfmgr-lineage)
+ifeq ($(TARGET_GRAPHICS),mesa)
+PRODUCT_PACKAGES += \
+    powerhint.nouveau.json
+PRODUCT_PROPERTY_OVERRIDES += \
+    vendor.powerhal.config=powerhint.nouveau.json
+endif
+endif
 
 # Permissions
 PRODUCT_COPY_FILES += \
@@ -97,16 +114,19 @@ PRODUCT_COPY_FILES += \
 endif
 
 # Audio
-PRODUCT_PACKAGES += \
-    audio_effects.xml \
-    audio_policy_configuration.xml \
-    nvaudio_conf.xml
+ifeq ($(TARGET_AUDIO_HAL),baylibre)
+PRODUCT_COPY_FILES += \
+    device/nvidia/tegra-common/nvaudio/primary_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/primary_audio_policy_configuration.xml
+endif
 
 # Bluetooth
+ifeq ($(TARGET_TEGRA_BT),bcm)
 $(call soong_config_set,brcm_libbt,bdroid_buildcfg_include_dir,device/nintendo/nx/comms)
 $(call soong_config_set,brcm_libbt,custom_bt_config,//device/nintendo/nx:vnd_nx.txt)
+endif
 
 # CEC
+ifneq ($(filter 4.9, $(TARGET_KERNEL_VERSION)),)
 PRODUCT_COPY_FILES := $(filter-out frameworks/native/data/etc/android.hardware.hdmi.cec.xml%android.hardware.hdmi.cec.xml,$(PRODUCT_COPY_FILES))
 
 PRODUCT_COPY_FILES += \
@@ -115,6 +135,7 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     nx_cec.rc \
     cec_disable.xml
+endif
 
 # Device Settings
 # TEMP
@@ -141,10 +162,12 @@ endif
 PRODUCT_PACKAGES += \
     excluded-input-devices.xml
 
+ifneq ($(filter 4.9, $(TARGET_KERNEL_VERSION)),)
 # Joycons
 PRODUCT_PACKAGES += \
     android.hardware.nintendo.joycond-service \
     jc_setup
+endif
 
 # Kernel Modules
 ifneq ($(filter 4.9, $(TARGET_KERNEL_VERSION)),)
@@ -170,21 +193,9 @@ PRODUCT_COPY_FILES += \
     device/nintendo/nx/initfiles/lkm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/lkm.rc
 endif
 
-# Media config
-PRODUCT_PACKAGES += \
-    media_codecs.xml \
-    media_codecs_performance.xml \
-    media_profiles_V1_0.xml \
-    enctune.conf
-
 # Partitions
 $(call inherit-product, $(SRC_TARGET_DIR)/product/non_ab_device.mk)
 
-# Power
-PRODUCT_COPY_FILES += \
-    system/core/libprocessgroup/profiles/cgroups_28.json:$(TARGET_COPY_OUT_VENDOR)/etc/cgroups.json \
-    system/core/libprocessgroup/profiles/task_profiles_28.json:$(TARGET_COPY_OUT_VENDOR)/etc/task_profiles.json
-
 # PHS
 ifneq ($(TARGET_TEGRA_PHS),)
 PRODUCT_PACKAGES += \
@@ -195,16 +206,25 @@ endif
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += persist.vendor.recovery_update=true
 
 # Shipping API
+ifneq ($(filter 4.9 5.10, $(TARGET_KERNEL_VERSION)),)
+PRODUCT_COPY_FILES += \
+    system/core/libprocessgroup/profiles/cgroups_28.json:$(TARGET_COPY_OUT_VENDOR)/etc/cgroups.json \
+    system/core/libprocessgroup/profiles/task_profiles_28.json:$(TARGET_COPY_OUT_VENDOR)/etc/task_profiles.json
+
 $(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_l.mk)
+else
+PRODUCT_SHIPPING_API_LEVEL := 36
+endif
 
 # Thermal
 ifneq ($(TARGET_TEGRA_THERMAL),)
-ifeq ($(filter 3.10 4.9 5.10, $(TARGET_KERNEL_VERSION)),)
-TARGET_TEGRA_THERMAL_SUFFIX ?= .ack
+ifneq ($(filter 4.9 5.10, $(TARGET_KERNEL_VERSION)),)
+PRODUCT_COPY_FILES += \
+    device/nintendo/nx/thermal/thermalhal.nx.xml:$(TARGET_COPY_OUT_VENDOR)/etc/thermalhal.nx.xml
+else
+PRODUCT_COPY_FILES += \
+    device/nintendo/nx/thermal/thermalhal.nx.ack.xml:$(TARGET_COPY_OUT_VENDOR)/etc/thermalhal.nx.xml
 endif
-
-PRODUCT_PACKAGES += \
-    thermalhal.nx$(TARGET_TEGRA_THERMAL_SUFFIX).xml
 endif
 
 # WiFi