From b5f3f05be28b66076c28fa6b63fe567530f44f1b Mon Sep 17 00:00:00 2001
From: Eino-Ville Talvala <etalvala@google.com>
Date: Mon, 23 Jan 2017 15:34:21 -0800
Subject: [PATCH] Camera: Keep using legacy camera service path for now

Until we can test the current state of muskie, do not switch over
to the new Treble path.

Test: None yet
Bug: 34626249
Change-Id: Ia0e63d0bd42cc7d53ea08601d0f388de005c21d5
---
 device-common.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/device-common.mk b/device-common.mk
index 9e7961b..1bdc6bc 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -135,6 +135,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
   persist.camera.tof.direct=1 \
   persist.camera.max.previewfps=60
 
+# camera service treble disable for bringup
+PRODUCT_PROPERTY_OVERRIDES += \
+  camera.disable_treble=1
+
 # WLAN driver configuration files
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf \