From 7e199551b7d45767d7a76de35c00f299bea04652 Mon Sep 17 00:00:00 2001 From: Leena Winterrowd 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 --- Android.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 393068fc6..c51a8a633 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) -- cgit v1.2.3