commit f48c3ac39d0f63b8cf16b92d3543b888715b13de
author The Android Open Source Project <initial-contribution@android.com> Mon May 10 11:11:09 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon May 10 11:11:09 2010 -0700
tree 5bf9222cffbf575634b71e30c9f8e8687931e04d
parent 758c0f347547456edd3151cd1481fbd9dbd8ffce
parent f7c634216e673407f5a7a879bcf2ddb2454e4670

am f7c63421: merge from open-source master

Merge commit 'f7c634216e673407f5a7a879bcf2ddb2454e4670' into kraken

* commit 'f7c634216e673407f5a7a879bcf2ddb2454e4670':
  Replace arm with proper variable for CPU/ABI

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index a80ae9b..fd2be64 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1384,12 +1384,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