summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk11
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