diff options
| author | Jiakai Zhang <jiakaiz@google.com> | 2023-06-26 15:55:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-06-26 15:55:50 +0000 |
| commit | ad9fc96657983289dfb11b07328b35cc0f0a0e49 (patch) | |
| tree | 18d27f03815f6fb623cc14328f17b0edcd9359fc | |
| parent | 52f01727725336f82e1f739858502f0a257882d5 (diff) | |
| parent | fbd41aa9b057d43da37df8ce1fe7157a8b084331 (diff) | |
| download | build-android12-dev.tar.gz | |
Merge "Use findstring to check MODULE_BUILD_FROM_SOURCE" into android12-devandroid12-dev
| -rw-r--r-- | core/android_soong_config_vars.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 39f01550fb..c6f4d68df9 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -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 (,$(filter com.google.android.conscrypt,$(PRODUCT_PACKAGES))) +ifeq (,$(findstring 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 ifdef MODULE_BUILD_FROM_SOURCE +else ifeq (true,$(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 (,$(filter com.google.android.art,$(PRODUCT_PACKAGES))) +else ifeq (,$(findstring 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 -ifdef MODULE_BUILD_FROM_SOURCE +ifeq (true,$(MODULE_BUILD_FROM_SOURCE)) $(call add_soong_config_var_value,ANDROID,module_build_from_source,true) endif |