StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ded6640d: Merge "Don\'t set up the prebuilt apk rule twice."

Browse Source 
* commit 'ded6640d970d83cb18ce2585565c11799064f5e0':
  Don't set up the prebuilt apk rule twice.
This commit is contained in:
Ying Wang
2014-12-02 17:45:44 +00:00
committed by Android Git Automerger
parent b2eaef2956 ded6640d97
commit 1d722cdb36
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/prebuilt.mk
View File

@@ -25,6 +25,10 @@ include $(BUILD_SYSTEM)/prebuilt_internal.mk
ifneq ($(my_module_multilib),both) ifneq ($(my_module_multilib),both)
my_skip_non_preferred_arch := true my_skip_non_preferred_arch := true
endif # $(my_module_multilib) endif # $(my_module_multilib)
# For apps, we don't want to set up the prebuilt apk rule twice even if "LOCAL_MULTILIB := both".
ifeq (APPS,$(LOCAL_MODULE_CLASS))
my_skip_non_preferred_arch := true
endif
endif # $(my_module_arch_supported) endif # $(my_module_arch_supported)
ifndef my_skip_non_preferred_arch ifndef my_skip_non_preferred_arch