commit ed15d1a140986473bbe7fffd72ec9618c41c5979
author Angus Kong <shkong@google.com> Mon Aug 19 15:06:12 2013 -0700
committer Angus Kong <shkong@google.com> Wed Sep 04 13:10:29 2013 -0700
tree ad5a3fdff05b54fef1ec076d5fa4c80e1a419888
parent 269c824d720b2e902c4ad6c3bb23422644da1f41

Bring back wide angle panorama.

  bug:10293937

Change-Id: I23a977e87b7416f07ecac20025b6c142ae61be05

Android.mk

diff --git a/Android.mk b/Android.mk
index a3659d0..ef47728 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,6 +26,15 @@
 
 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))