X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Android.mk;h=97570dcbedf98ce34f52d8c175c2ad3e2422b54d;hb=dfd3ecb1b6bbec03d419b3a65a10dd344ae5dbc3;hp=ca6d26a50b4e857c9ad1e81b70fd4cb067ea925b;hpb=da954448a5ec6fc7cac1612732cbb742d966c570;p=android-x86%2Fpackages-apps-Camera2.git

diff --git a/Android.mk b/Android.mk
index ca6d26a50..97570dcbe 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,6 +8,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
 LOCAL_STATIC_JAVA_LIBRARIES += android-ex-camera2-portability
 LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
 LOCAL_STATIC_JAVA_LIBRARIES += glide
+LOCAL_STATIC_JAVA_LIBRARIES += guava
+LOCAL_STATIC_JAVA_LIBRARIES += jsr305
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
@@ -30,14 +32,7 @@ LOCAL_SDK_VERSION := current
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
-# If this is an unbundled build (to install seprately) 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_tinyplanet
-else
-  LOCAL_REQUIRED_MODULES := libjni_tinyplanet
-endif
+LOCAL_JNI_SHARED_LIBRARIES := libjni_tinyplanet libjni_jpegutil
 
 include $(BUILD_PACKAGE)