ack again

Change-Id: If55f4617e18459f7ee03418dd8ddba0dcd032462

device.mk

@@ -16,32 +16,13 @@
 
 TARGET_TEGRA_VARIANT    ?= common
 
-TARGET_KERNEL_VERSION ?= 4.9
-TARGET_TEGRA_KEYSTORE := software
-TARGET_TEGRA_LIGHT    ?= lineage
-#TARGET_TEGRA_THERMAL  ?= lineage
-TARGET_TEGRA_UBOOT    := prebuilt
-TARGET_TEGRA_POWER    := perfmgr
+TARGET_KERNEL_VERSION ?= mainline
+TARGET_LIGHT_HAL      ?= tegra
 
 TARGET_ATV_FORCE_1080_SCALING := false
 
-ifneq ($(filter 4.9, $(TARGET_KERNEL_VERSION)),)
-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
+    device/nintendo/nx/initfiles/ack.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/ack.rc
 
 include device/nvidia/t210-common/t210.mk
 
@@ -84,20 +65,11 @@ 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
+    powerhint.nouveau.json \
+    powerhint.t210b01.json \
+    powerhint.t210b01.nouveau.json
 endif
 
 # Permissions
@@ -119,30 +91,20 @@ PRODUCT_COPY_FILES += \
     device/nvidia/tegra-common/audio/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 := $(filter-out frameworks/native/data/etc/android.hardware.hdmi.cec.xml%android.hardware.hdmi.cec.xml,$(PRODUCT_COPY_FILES))
 
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.hdmi.cec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/staging/android.hardware.hdmi.cec.xml
+# PRODUCT_COPY_FILES += \
+#     frameworks/native/data/etc/android.hardware.hdmi.cec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/staging/android.hardware.hdmi.cec.xml
 
-PRODUCT_PACKAGES += \
-    nx_cec.rc \
-    cec_disable.xml
-endif
+# PRODUCT_PACKAGES += \
+#     nx_cec.rc \
+#     cec_disable.xml
 
 # Device Settings
 # TEMP
-ifneq ($(filter 4.9, $(TARGET_KERNEL_VERSION)),)
-PRODUCT_PACKAGES += \
-    DeviceSettingsNX
-endif
+# PRODUCT_PACKAGES += \
+#     DeviceSettingsNX
 
 # DocumentsUI
 # We are the exception, being an ATV device with touch
@@ -162,18 +124,10 @@ 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)),)
-PRODUCT_PACKAGES += \
-    cypress-fmac-upstream
-endif
+# PRODUCT_PACKAGES += \
+#     android.hardware.nintendo.joycond-service \
+#     jc_setup
 
 # Keylayouts
 PRODUCT_PACKAGES += \
@@ -185,47 +139,22 @@ PRODUCT_PACKAGES += \
 
 PRODUCT_COPY_FILES += \
     device/nvidia/tegra-common/initfiles/init.lkm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.lkm.rc
-ifneq ($(filter 4.9, $(TARGET_KERNEL_VERSION)),)
-PRODUCT_PACKAGES += \
-    lkm_loader_target
-else
+
 PRODUCT_COPY_FILES += \
     device/nintendo/nx/initfiles/lkm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/lkm.rc
-endif
 
 # Partitions
 $(call inherit-product, $(SRC_TARGET_DIR)/product/non_ab_device.mk)
 
-# PHS
-ifneq ($(TARGET_TEGRA_PHS),)
-PRODUCT_PACKAGES += \
-    nvphsd.conf
-endif
-
 # Recovery
 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
+PRODUCT_SHIPPING_API_LEVEL := 37
 
 # Thermal
-ifneq ($(TARGET_TEGRA_THERMAL),)
-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
-endif
 
 # WiFi
 PRODUCT_PACKAGES += \