summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorLeena Winterrowd <lenhardw@codeaurora.org>2014-08-13 19:00:39 (GMT)
committerLeena Winterrowd <lenhardw@codeaurora.org>2014-08-17 05:36:00 (GMT)
commit7e199551b7d45767d7a76de35c00f299bea04652 (patch)
tree2770882b18b4baf103cb8fd1180757f9d6440408 /Android.mk
parent89d153ba5666f76bb603198fe175fa92aa75431f (diff)
downloadandroid_packages_apps_Snap-7e199551b7d45767d7a76de35c00f299bea04652.zip
android_packages_apps_Snap-7e199551b7d45767d7a76de35c00f299bea04652.tar.gz
android_packages_apps_Snap-7e199551b7d45767d7a76de35c00f299bea04652.tar.bz2
SnapdragonCamera: Fix static library name conflict
A JNI lib is built for both the Camera2 app and SnapdragonCamera but is included in system/lib. Since this lib has been branched as well, rename it and explicitly bundle it with the app to avoid the library name conflict. Change-Id: I3177d0a99be06cef0b841d8e84e652b8974cadc6
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index 393068f..c51a8a6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -27,13 +27,13 @@ LOCAL_PACKAGE_NAME := SnapdragonCamera
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-# If this is an unbundled build (to install seprately) then include
+# If this is an unbundled build (to install separately) 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_tinyplanet
+ LOCAL_JNI_SHARED_LIBRARIES := libjni_snapcammosaic libjni_snapcamtinyplanet
else
- LOCAL_REQUIRED_MODULES := libjni_mosaic libjni_tinyplanet
+ LOCAL_REQUIRED_MODULES := libjni_snapcammosaic libjni_snapcamtinyplanet
endif
include $(BUILD_PACKAGE)