summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhao Wei Liew <zhaoweiliew@gmail.com>2016-11-21 18:39:23 +0800
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-11-21 10:01:21 -0800
commit51b75610335476b1a40b714848e8cb97921f50dd (patch)
tree5a14f76bc46a687358f718e127b7da3f09fdc9ec
parent5438ae10adc08d46e1e05febabeaab8b854497bc (diff)
downloadandroid_packages_apps_Snap-51b75610335476b1a40b714848e8cb97921f50dd.tar.gz
android_packages_apps_Snap-51b75610335476b1a40b714848e8cb97921f50dd.tar.bz2
android_packages_apps_Snap-51b75610335476b1a40b714848e8cb97921f50dd.zip
Revert "snap: Provide a way to remove Snap from the build"
By removing the 'Snap' entry in the device makefiles, Camera2 can be built instead of Snap. This reverts commit e4351681fcb22d2b08562bf14ebeb32573e41d7f. Change-Id: I07c5e18652a016a640df33a224ccaae31d5cdccb
-rw-r--r--Android.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index bfc0dd91e..45701b545 100644
--- a/Android.mk
+++ b/Android.mk
@@ -33,9 +33,7 @@ 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