summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2016-10-05 07:19:48 -0700
committerSteve Kondik <steve@cyngn.com>2016-10-05 07:22:11 -0700
commit177bbfc4bd18c111a219a321c20cd55a82cee368 (patch)
treec69153027b615d42a5cd99a0b02a03a3c78b40fd
parent95309463d1f17c6d5ba78d31817f70a45c9624ff (diff)
downloadandroid_packages_apps_Snap-177bbfc4bd18c111a219a321c20cd55a82cee368.zip
android_packages_apps_Snap-177bbfc4bd18c111a219a321c20cd55a82cee368.tar.gz
android_packages_apps_Snap-177bbfc4bd18c111a219a321c20cd55a82cee368.tar.bz2
snap: Provide a way to remove Snap from the build
* Until Snap is updated with Camera2 support, it needs to get out of the way in a few cases. Allow a device to name it's preferred camera app which will remove the override from the makefile. Change-Id: I2ead4c092fbbe259501f856081e1e98be04c6fbd
-rw-r--r--Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 3d67113..cefe8f2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -31,7 +31,9 @@ LOCAL_PRIVILEGED_MODULE := true
#LOCAL_SDK_VERSION := current
LOCAL_RENDERSCRIPT_TARGET_API := 23
+ifneq ($(TARGET_CAMERA_APP),Camera2)
LOCAL_OVERRIDES_PACKAGES := Camera2
+endif
LOCAL_PROGUARD_FLAG_FILES := proguard.flags