summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2016-10-05 07:19:48 -0700
committerMichael Bestas <mikeioannina@gmail.com>2017-01-04 21:57:51 +0200
commitbf686cbf2fce8382eff5f15bfb968e189259c81c (patch)
tree37247bbf6bf7ee995c23ba826fbb599d49595c4a
parent790723d97dae84f96661acc1b171ef29865815b1 (diff)
downloadandroid_packages_apps_Snap-bf686cbf2fce8382eff5f15bfb968e189259c81c.zip
android_packages_apps_Snap-bf686cbf2fce8382eff5f15bfb968e189259c81c.tar.gz
android_packages_apps_Snap-bf686cbf2fce8382eff5f15bfb968e189259c81c.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 2e2a665..faf35b8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -29,7 +29,9 @@ LOCAL_AAPT_FLAGS += --rename-manifest-package org.cyanogenmod.snap
#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