From 3665e64109ca250fdd1687e464773566cf1d7226 Mon Sep 17 00:00:00 2001 From: Eino-Ville Talvala Date: Tue, 24 Jan 2017 12:17:25 -0800 Subject: [PATCH] Emulator builds: Disable camera service Treble mode for now Until all backwards-compatibility support is in place, the emulator targets need to not use the Treble path. Bug: 32991422 Bug: 32989965 Test: Built aosp_x86_64-eng and verified build.prop has the new key Change-Id: I72487126b0ec7c7794bb3f57f4b1a649a2ec140b --- target/product/emulator.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target/product/emulator.mk b/target/product/emulator.mk index 1ac98e6e9..51e926dc2 100644 --- a/target/product/emulator.mk +++ b/target/product/emulator.mk @@ -65,6 +65,10 @@ PRODUCT_PACKAGES += \ android.hardware.keymaster@3.0-impl \ android.hardware.keymaster@3.0-service +# camera service treble disable until all backwards compat is complete +PRODUCT_PROPERTY_OVERRIDES += \ + camera.disable_treble=1 + PRODUCT_COPY_FILES += \ device/generic/goldfish/fstab.goldfish:root/fstab.goldfish \ device/generic/goldfish/init.goldfish.rc:root/init.goldfish.rc \