diff options
| author | Ying Wang <wangying@google.com> | 2014-04-18 23:56:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-18 23:56:22 +0000 |
| commit | 6ad0c4ffc3d50a6829a984c2ac37525680fc61eb (patch) | |
| tree | a96a49069403c48d9fedcf0cba5461b918179ffc | |
| parent | 7a6bd46dc1a67e79afe1045877cf0115d43a6be8 (diff) | |
| parent | c5477e7ef15f1b59eccd881f60756fe9ba981f74 (diff) | |
| download | android_packages_apps_Gallery2-6ad0c4ffc3d50a6829a984c2ac37525680fc61eb.tar.gz android_packages_apps_Gallery2-6ad0c4ffc3d50a6829a984c2ac37525680fc61eb.tar.bz2 android_packages_apps_Gallery2-6ad0c4ffc3d50a6829a984c2ac37525680fc61eb.zip | |
Merge "Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build."
| -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 |