summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorLikai Ding <likaid@codeaurora.org>2016-06-06 15:08:29 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-06-30 23:56:46 -0700
commitce6d1cff610acd77b3383d66b7626244cf803493 (patch)
tree23135016476c8028299e6bc716d20235053263d3 /Android.mk
parent7362c026871e6ce0bb2a6e9a3de6b55c9a917e96 (diff)
downloadandroid_packages_apps_Gallery2-ce6d1cff610acd77b3383d66b7626244cf803493.tar.gz
android_packages_apps_Gallery2-ce6d1cff610acd77b3383d66b7626244cf803493.tar.bz2
android_packages_apps_Gallery2-ce6d1cff610acd77b3383d66b7626244cf803493.zip
Gallery: multiple fixes
1. fix malformed manifest 2. enable proguard 3. new app name CRs-Fixed: 1024516 Change-Id: I1b4cff166173fc396d9d9c7d5fa2737246e9de42
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk4
1 files changed, 0 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index ebf779268..076efffa7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -29,8 +29,6 @@ LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
# $(warning Anand Commend LOCAL_RENDERSCRIPT_SKIP_INSTALL is $(LOCAL_RENDERSCRIPT_SKIP_INSTALL))
-LOCAL_PROGUARD_ENABLED := disabled
-
LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res
LOCAL_AAPT_FLAGS := --auto-add-overlay
@@ -41,8 +39,6 @@ LOCAL_PRIVILEGED_MODULE := true
LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D Gallery2
-LOCAL_PROGUARD_ENABLED := disabled
-
LOCAL_SDK_VERSION := current
LOCAL_JNI_SHARED_LIBRARIES := libjni_gallery_eglfence libjni_gallery_filters libjni_gallery_jpegstream