Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63cac277 authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

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

parents 68ed2f54 f48c3ac3

core/definitions.mk

+2 −4
Original line number Diff line number Diff line
@@ -1384,12 +1384,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