commit 0bcc4a66c7483c56a05462eb966ac362efeea17a
author Guillaume La Roque <glaroque@baylibre.com> Tue Jun 25 12:16:45 2019 +0000
committer Dmitry Shmidt <dimitrysh@google.com> Fri Jun 28 16:25:03 2019 -0700
tree ccac352dedf7b4cfc8fa3107672269ef98b06dcd
parent 706c8f723331ca6120f1694445ea2ca01843c5a6

yukawa: enable treble

Bug: 136192457

Change-Id: Ie492931718496fa6814db9a7aac5d19a114ff8fa
Signed-off-by: Guillaume La Roque <glaroque@baylibre.com>

BoardConfig.mk

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 917c5e7..eb99616 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -30,11 +30,9 @@
 BOARD_WPA_SUPPLICANT_DRIVER := NL80211
 BOARD_HOSTAPD_DRIVER := NL80211
 
-# disable Treble
-PRODUCT_FULL_TREBLE_OVERRIDE := false
-PRODUCT_FULL_TREBLE := false
-PRODUCT_TREBLE_LINKER_NAMESPACES := false
-# BOARD_VNDK_VERSION := current
+# Treble
+PRODUCT_FULL_TREBLE_OVERRIDE := true
+BOARD_VNDK_VERSION := current
 
 TARGET_NO_BOOTLOADER := true
 TARGET_NO_KERNEL := false

device.mk

diff --git a/device.mk b/device.mk
index beb6354..b665601 100644
--- a/device.mk
+++ b/device.mk
@@ -18,6 +18,9 @@
 # Build and run only ART
 PRODUCT_RUNTIMES := runtime_libart_default
 
+# Enable updating of APEXes
+$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
+
 # Setup TV Build
 USE_OEM_TV_APP := true
 $(call inherit-product, device/google/atv/products/atv_base.mk)
@@ -27,6 +30,9 @@
 DEVICE_PACKAGE_OVERLAYS := device/amlogic/yukawa/overlay
 DEVICE_PACKAGE_OVERLAYS += device/google/atv/overlay
 
+# All VNDK libraries (HAL interfaces, VNDK, VNDK-SP, LL-NDK)
+PRODUCT_PACKAGES += vndk_package
+
 PRODUCT_PACKAGES += \
     android.hardware.health@2.0-service.yukawa \
     android.hardware.health@2.0-service