Replace arm with proper variable for CPU/ABI
Change-Id: If8594d9a2abf4d8c08b5ccea612bb700afa9e9b7
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