From cda5ae868e98e1aad5d2924b3524d7caae1834ba Mon Sep 17 00:00:00 2001 From: Bart Sears Date: Fri, 28 Sep 2012 10:40:05 -0700 Subject: 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 --- Android.mk | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'Android.mk') 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 -- cgit v1.2.3