commit b33aabdd84b9d82b1132e332b7ed53cd648b7a9e
author Eino-Ville Talvala <etalvala@google.com> Tue Jun 07 13:06:55 2011 -0700
committer Eino-Ville Talvala <etalvala@google.com> Tue Jun 07 13:28:00 2011 -0700
tree 457e526b1f27ca6143f0c011e081150107929f1b
parent 86d93bb165aa0f1f8023e3b56f30382f1b4c2cec

Fix to CameraAnalyzer JNI library build process.

Now works from APK properly as intended.

Change-Id: I8b8914a403fe028cdfddacb2c5537a5e687554c2

apps/CameraAnalyzer/Android.mk

diff --git a/apps/CameraAnalyzer/Android.mk b/apps/CameraAnalyzer/Android.mk
index dbea24e..d26bed7 100644
--- a/apps/CameraAnalyzer/Android.mk
+++ b/apps/CameraAnalyzer/Android.mk
@@ -31,7 +31,7 @@
                           libcutils \
                           libutils
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
 
 #####################
 # Build JNI library
@@ -46,9 +46,10 @@
 
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/include $(JNI_H_INCLUDE)
 
+LOCAL_STATIC_LIBRARIES := libcolorchecker
 LOCAL_SHARED_LIBRARIES := libandroid \
-                          libcolorchecker \
                           libjnigraphics \
+                          libstlport \
                           libcutils \
                           libutils
 
@@ -62,8 +63,7 @@
 LOCAL_PACKAGE_NAME := CameraAnalyzer
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_SHARED_LIBRARIES := libcameraanalyzer_jni \
-                          libcolorchecker
+LOCAL_JNI_SHARED_LIBRARIES := libcameraanalyzer_jni
 
 LOCAL_SRC_FILES := $(call all-subdir-java-files)