From 7e199551b7d45767d7a76de35c00f299bea04652 Mon Sep 17 00:00:00 2001
From: Leena Winterrowd <lenhardw@codeaurora.org>
Date: Wed, 13 Aug 2014 12:00:39 -0700
Subject: 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
---
 jni/Android.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'jni')

diff --git a/jni/Android.mk b/jni/Android.mk
index b9bafcf6c..af2d81462 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
-- 
cgit v1.2.3