commit 5b9f19e58f55c67a5ebcbd4988a37142cc7ac770
author Bruce Beare <brucex.j.beare@intel.com> Wed May 05 09:47:16 2010 -0700
committer Bruce Beare <brucex.j.beare@intel.com> Wed May 05 11:26:04 2010 -0700
tree 5fe3e3184d02e2e8d33944f46ab1029817d7a924
parent f015e94dc89ea21d40ab06c84e496d01be36ac13

Replace arm with proper variable for CPU/ABI

Change-Id: If8594d9a2abf4d8c08b5ccea612bb700afa9e9b7

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 3221525..27e38d3 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1324,12 +1324,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