summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorAngus Kong <shkong@google.com>2013-08-19 22:06:12 (GMT)
committerAngus Kong <shkong@google.com>2013-09-04 20:10:29 (GMT)
commited15d1a140986473bbe7fffd72ec9618c41c5979 (patch)
treead5a3fdff05b54fef1ec076d5fa4c80e1a419888 /Android.mk
parent269c824d720b2e902c4ad6c3bb23422644da1f41 (diff)
downloadandroid_packages_apps_Snap-ed15d1a140986473bbe7fffd72ec9618c41c5979.zip
android_packages_apps_Snap-ed15d1a140986473bbe7fffd72ec9618c41c5979.tar.gz
android_packages_apps_Snap-ed15d1a140986473bbe7fffd72ec9618c41c5979.tar.bz2
Bring back wide angle panorama.
bug:10293937 Change-Id: I23a977e87b7416f07ecac20025b6c142ae61be05
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk9
1 files changed, 9 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index a3659d0..ef47728 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,6 +26,15 @@ LOCAL_SDK_VERSION := current
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+# 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
+else
+ LOCAL_REQUIRED_MODULES := libjni_mosaic
+endif
+
include $(BUILD_PACKAGE)
include $(call all-makefiles-under, $(LOCAL_PATH))