diff options
author | Bart Sears <bsears@google.com> | 2012-09-28 10:40:05 -0700 |
---|---|---|
committer | Bart Sears <bsears@google.com> | 2012-09-28 10:40:05 -0700 |
commit | ec6034e8cac6148aa48e4b2e46f4cf73b6f458dc (patch) | |
tree | c9b0140e9379708f53524125f3386862d1f8d11f /Android.mk | |
parent | f8706c89cb45b45426f6bad8c593191595b043a2 (diff) | |
download | android_packages_apps_Gallery2-ec6034e8cac6148aa48e4b2e46f4cf73b6f458dc.tar.gz android_packages_apps_Gallery2-ec6034e8cac6148aa48e4b2e46f4cf73b6f458dc.tar.bz2 android_packages_apps_Gallery2-ec6034e8cac6148aa48e4b2e46f4cf73b6f458dc.zip |
Add FilterShow and clean up native lib handling
Bug: 7165910
Add libjni_filtershow_filters to Gallery2 so users can edit photos
Bug: 7250099
Remove native libs from the apk in /system/apps
Change-Id: I0a8adacdcb4c349861187e4303d08666e204a266
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk index 5029a9065..1d3559737 100644 --- a/Android.mk +++ b/Android.mk @@ -26,9 +26,14 @@ LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D LOCAL_SDK_VERSION := 16 -LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic libjni_eglfence - -LOCAL_REQUIRED_MODULES := libjni_mosaic libjni_eglfence +# 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_mosaic libjni_eglfence libjni_filtershow_filters +else + LOCAL_REQUIRED_MODULES := libjni_mosaic libjni_eglfence libjni_filtershow_filters +endif LOCAL_PROGUARD_FLAG_FILES := proguard.flags |