commit d4e85a97e75242e7465a8adbafac0b9a4dbe0ec1
author Anton Hansson <hansson@google.com> Thu Apr 30 10:58:43 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 30 10:58:43 2020 +0000
tree 7b088e516489ce227df4179c2b5cca815d49b2c6
parent a9800b4db5d377a5c2208cc546601a66c46407d2
parent 41a6e3b02f3a6d0d0b321f70c40100d2c6fd2eae

Merge "Revert "remove emulator_vendor.mk from aosp_arm64.mk""

target/product/aosp_arm64.mk

diff --git a/target/product/aosp_arm64.mk b/target/product/aosp_arm64.mk
index e14effc..3254ccf 100644
--- a/target/product/aosp_arm64.mk
+++ b/target/product/aosp_arm64.mk
@@ -48,8 +48,10 @@
 #
 $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
 
-PRODUCT_FULL_TREBLE_OVERRIDE := true
-
+#
+# All components inherited here go to vendor or vendor_boot image
+#
+$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk)
 
 #