am 63cac277: am f48c3ac3: am f7c63421: merge from open-source master
This commit is contained in:
commit
2373361ecb
|
@ -1390,12 +1390,10 @@ $(hide) $(AAPT) package -u $(PRIVATE_AAPT_FLAGS) \
|
|||
-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
|
||||
|
|
Loading…
Reference in New Issue