commit 2373361ecb6dbd31d8a558f7e3c4cfa3e75206c3
author The Android Open Source Project <initial-contribution@android.com> Mon May 10 11:13:56 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon May 10 11:13:56 2010 -0700
tree d920db8775b5bfc3e8eb7cc3c45cc06e6689a35a
parent 0f28a157558b89f10cf07b7de1773ebc11f02ba4
parent 63cac27739a3000b0778ff63accc58a0cc72548d

am 63cac277: am f48c3ac3: am f7c63421: merge from open-source master

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index b559326..e3fef7e 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1390,12 +1390,10 @@
     -F $@
 endef
 
-#TODO: Allow library directory to be specified based on the target
-#      CPU and ABI instead of being hard coded as armeabi.
 define add-jni-shared-libs-to-package
 $(hide) rm -rf $(dir $@)lib
-$(hide) mkdir -p $(dir $@)lib/armeabi
-$(hide) cp $(PRIVATE_JNI_SHARED_LIBRARIES) $(dir $@)lib/armeabi
+$(hide) mkdir -p $(dir $@)lib/$(TARGET_CPU_ABI)
+$(hide) cp $(PRIVATE_JNI_SHARED_LIBRARIES) $(dir $@)lib/$(TARGET_CPU_ABI)
 $(hide) (cd $(dir $@) && zip -r $(notdir $@) lib)
 $(hide) rm -rf $(dir $@)lib
 endef