diff options
| author | Jack Yoo <jyoo@codeaurora.org> | 2015-09-19 20:36:49 -0700 |
|---|---|---|
| committer | Jack Yoo <jyoo@codeaurora.org> | 2015-09-19 20:36:49 -0700 |
| commit | 276a28999702d4dc9162c3109e3836f6d8e153b7 (patch) | |
| tree | 0ad131c5590e6d98b7b769bdfecee5509b27a471 /Android.mk | |
| parent | d0f2d788d61327deb8de1d8ac4cc5336a221de90 (diff) | |
| parent | 7ddcf642ef908a8514b159c4ad1859b050be001e (diff) | |
| download | android_packages_apps_Gallery2-276a28999702d4dc9162c3109e3836f6d8e153b7.tar.gz android_packages_apps_Gallery2-276a28999702d4dc9162c3109e3836f6d8e153b7.tar.bz2 android_packages_apps_Gallery2-276a28999702d4dc9162c3109e3836f6d8e153b7.zip | |
Merge remote-tracking branch 'remotes/quic/private_redfox64_MRA58G' into HEAD
Change-Id: I55718147034e332c7c8b27840963cc49b6f5424f
Diffstat (limited to 'Android.mk')
| -rwxr-xr-x | Android.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index 0b471b641..7bf05c487 100755 --- a/Android.mk +++ b/Android.mk @@ -35,7 +35,9 @@ LOCAL_CERTIFICATE := platform LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D -#LOCAL_SDK_VERSION := current +LOCAL_PROGUARD_ENABLED := disabled + +LOCAL_SDK_VERSION := current LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters librsjni libjni_jpegstream @@ -45,7 +47,7 @@ endif LOCAL_PROGUARD_FLAG_FILES := proguard.flags -LOCAL_MULTILIB := 32 +LOCAL_JAVA_LIBRARIES += org.apache.http.legacy include $(BUILD_PACKAGE) |