Merge "LOCAL_JNI_SHARED_LIBRARIES now works for both bundled and unbundled build."

c71e0154 · Ying Wang · Gerrit Code Review · b102c508 · 877ed336 · c71e0154
Commit c71e0154 authored 11 years ago by Ying Wang Committed by Gerrit Code Review 11 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 8 deletions

Android.mk Android.mk +1 -8

No files found.
--- a/Android.mk
+++ b/Android.mk
@@ -27,14 +27,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_mosaic libjni_tinyplanet
-else
-  LOCAL_REQUIRED_MODULES := libjni_mosaic libjni_tinyplanet
-endif
+LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic libjni_tinyplanet

 include $(BUILD_PACKAGE)