Import translations. DO NOT MERGE am: 8bc8d4d4f7 -s ours am: 8fdb88e42b -s ours

[android-x86/packages-apps-Gallery2.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index cf5b767..3088512 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -33,20 +33,13 @@ LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D
 
 LOCAL_SDK_VERSION := current
 
-# 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_eglfence libjni_filtershow_filters librsjni libjni_jpegstream
-else
-  LOCAL_REQUIRED_MODULES := libjni_eglfence libjni_filtershow_filters libjni_jpegstream
-endif
+LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters librsjni libjni_jpegstream
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
-include $(BUILD_PACKAGE)
+LOCAL_JAVA_LIBRARIES += org.apache.http.legacy
 
-include $(call all-makefiles-under, jni)
+include $(BUILD_PACKAGE)
 
 ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)