openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Revert "Change function to check MODULE_BUILD_FROM_SOURCE" am: f3055ad6a6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15783351

Change-Id: I3e9f50c298a3322fad5f4711539a5656237e3b8e
This commit is contained in:
Joe Onorato 2021-09-08 09:05:34 +00:00 committed by Automerger Merge Worker
parent 4b609dfc6d f3055ad6a6
commit b04f414eed
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/android_soong_config_vars.mk
View File

@ -29,7 +29,7 @@ $(call add_soong_config_namespace,ANDROID)
$(call add_soong_config_var,ANDROID,TARGET_ENABLE_MEDIADRM_64)
$(call add_soong_config_var,ANDROID,BOARD_USES_ODMIMAGE)
ifeq (,$(findstring com.google.android.conscrypt,$(PRODUCT_PACKAGES)))
ifeq (,$(filter com.google.android.conscrypt,$(PRODUCT_PACKAGES)))
# Prebuilt module SDKs require prebuilt modules to work, and currently
# prebuilt modules are only provided for com.google.android.xxx. If we can't
# find one of them in PRODUCT_PACKAGES then assume com.android.xxx are in use,
@ -49,7 +49,7 @@ else ifeq (,$(filter-out modules_% mainline_modules_%,$(TARGET_PRODUCT)))
# Always build from source for the module targets. This ought to be covered by
# the TARGET_BUILD_APPS check above, but there are test builds that don't set it.
SOONG_CONFIG_art_module_source_build := true
else ifeq (true,$(MODULE_BUILD_FROM_SOURCE))
else ifdef MODULE_BUILD_FROM_SOURCE
# Build from source if other Mainline modules are.
SOONG_CONFIG_art_module_source_build := true
else ifneq (,$(filter true,$(NATIVE_COVERAGE) $(CLANG_COVERAGE)))
@ -72,7 +72,7 @@ else ifeq (,$(filter x86 x86_64,$(HOST_CROSS_ARCH)))
else ifneq (,$(filter dex2oatds dex2oats,$(PRODUCT_HOST_PACKAGES)))
# Some products depend on host tools that aren't available as prebuilts.
SOONG_CONFIG_art_module_source_build := true
else ifeq (,$(findstring com.google.android.art,$(PRODUCT_PACKAGES)))
else ifeq (,$(filter com.google.android.art,$(PRODUCT_PACKAGES)))
# TODO(b/192006406): There is currently no good way to control which prebuilt
# APEX (com.google.android.art or com.android.art) gets picked for deapexing
# to provide dex jars for hiddenapi and dexpreopting. Instead the AOSP APEX is
@ -90,6 +90,6 @@ ifdef APEX_BUILD_FOR_PRE_S_DEVICES
$(call add_soong_config_var_value,ANDROID,library_linking_strategy,prefer_static)
endif
ifeq (true,$(MODULE_BUILD_FROM_SOURCE))
ifdef MODULE_BUILD_FROM_SOURCE
$(call add_soong_config_var_value,ANDROID,module_build_from_source,true)
endif