Merge "LOCAL_JNI_SHARED_LIBRARIES now works for both bundled and unbundled build."
diff --git a/Android.mk b/Android.mk
index 0aeee74..4f27849 100644
--- a/Android.mk
+++ b/Android.mk
@@ -27,14 +27,7 @@
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_mosaic libjni_tinyplanet
-else
- LOCAL_REQUIRED_MODULES := libjni_mosaic libjni_tinyplanet
-endif
+LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic libjni_tinyplanet
include $(BUILD_PACKAGE)
