summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhao Wei Liew <zhaoweiliew@gmail.com>2016-11-21 18:39:23 +0800
committerMichael Bestas <mikeioannina@gmail.com>2017-01-04 22:00:44 +0200
commitf68cfef7b4299137151c55e41ad32eeaeee713a7 (patch)
tree93dd4d04c7e284672ee4e8e280a72bee1be7a676
parent4b103963bcb7e8cb7417b6f26643c272d0a5d6d0 (diff)
downloadandroid_packages_apps_Snap-f68cfef7b4299137151c55e41ad32eeaeee713a7.zip
android_packages_apps_Snap-f68cfef7b4299137151c55e41ad32eeaeee713a7.tar.gz
android_packages_apps_Snap-f68cfef7b4299137151c55e41ad32eeaeee713a7.tar.bz2
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 bfc0dd9..45701b5 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