tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am f7c63421: merge from open-source master

Browse source 
Merge commit 'f7c634216e673407f5a7a879bcf2ddb2454e4670' into kraken

* commit 'f7c634216e673407f5a7a879bcf2ddb2454e4670':
  Replace arm with proper variable for CPU/ABI
This commit is contained in:
The Android Open Source Project 2010-05-10 11:11:09 -07:00 committed by Android Git Automerger
commit f48c3ac39d
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/definitions.mk
View file

@ -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