summaryrefslogtreecommitdiffstats
path: root/jni
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 /jni
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 'jni')
-rwxr-xr-xjni/Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/jni/Android.mk b/jni/Android.mk
index b9bafcf..af2d814 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -56,7 +56,7 @@ LOCAL_LDFLAGS := -llog -lGLESv2
LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libjni_mosaic
+LOCAL_MODULE := libjni_snapcammosaic
include $(BUILD_SHARED_LIBRARY)
# TinyPlanet
@@ -65,7 +65,7 @@ include $(CLEAR_VARS)
LOCAL_CPP_EXTENSION := .cc
LOCAL_LDFLAGS := -llog -ljnigraphics
LOCAL_SDK_VERSION := 9
-LOCAL_MODULE := libjni_tinyplanet
+LOCAL_MODULE := libjni_snapcamtinyplanet
LOCAL_SRC_FILES := tinyplanet.cc
LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops