diff options
| author | Ying Wang <wangying@google.com> | 2014-04-17 18:33:18 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-04-17 18:33:18 -0700 |
| commit | a1ac650151176485d3fedb5ee598857f853a10a6 (patch) | |
| tree | 45d5d9ae62bbbc65561ad551d8ced2103b67067e /Android.mk | |
| parent | 0078ee9ab33c85aa94e4903a6d46aa2032319ad4 (diff) | |
| download | android_packages_apps_Gallery2-a1ac650151176485d3fedb5ee598857f853a10a6.tar.gz android_packages_apps_Gallery2-a1ac650151176485d3fedb5ee598857f853a10a6.tar.bz2 android_packages_apps_Gallery2-a1ac650151176485d3fedb5ee598857f853a10a6.zip | |
Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build.
Change-Id: Id0a381ce06370347670ab9b324039ccc2222f93c
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/Android.mk b/Android.mk index cf5b767bb..b814907b4 100644 --- a/Android.mk +++ b/Android.mk @@ -33,14 +33,7 @@ LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D LOCAL_SDK_VERSION := current -# If this is an unbundled build (to install seprately) then include -# the libraries in the APK, otherwise just put them in /system/lib and -# leave them out of the APK -ifneq (,$(TARGET_BUILD_APPS)) - LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters librsjni libjni_jpegstream -else - LOCAL_REQUIRED_MODULES := libjni_eglfence libjni_filtershow_filters libjni_jpegstream -endif +LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters librsjni libjni_jpegstream LOCAL_PROGUARD_FLAG_FILES := proguard.flags |