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

Don't set up the prebuilt apk rule twice.

Browse Source 
For apps, we don't want to set up the prebuilt apk rule twice even if
"LOCAL_MULTILIB := both", which for apps really means to set up only the
jni library rules twice. See also build/core/install_jni_libs.mk.

Change-Id: Id0406c3c605c6ede613dba06178a1710590c09b3
This commit is contained in:
Ying Wang
2014-12-01 15:56:19 -08:00
parent 7dcbc563f8
commit a11cf4d535
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