Merge "Drop ART_MODULE_BUILD_FROM_SOURCE" into main am: 09c5581b12
Original change: https://android-review.googlesource.com/c/platform/build/+/3037396 Change-Id: Ifb05414bfd9472d17d0c5ec3d9e2631eabed2aca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -59,17 +59,6 @@ else
|
|||||||
MODULE_BUILD_FROM_SOURCE := $(BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE)
|
MODULE_BUILD_FROM_SOURCE := $(BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq (,$(ART_MODULE_BUILD_FROM_SOURCE))
|
|
||||||
# Keep an explicit setting.
|
|
||||||
else ifneq (,$(findstring .android.art,$(TARGET_BUILD_APPS)))
|
|
||||||
# Build ART modules from source if they are listed in TARGET_BUILD_APPS.
|
|
||||||
ART_MODULE_BUILD_FROM_SOURCE := true
|
|
||||||
else
|
|
||||||
# Do the same as other modules by default.
|
|
||||||
ART_MODULE_BUILD_FROM_SOURCE := $(MODULE_BUILD_FROM_SOURCE)
|
|
||||||
endif
|
|
||||||
|
|
||||||
$(call soong_config_set,art_module,source_build,$(ART_MODULE_BUILD_FROM_SOURCE))
|
|
||||||
ifdef ART_DEBUG_OPT_FLAG
|
ifdef ART_DEBUG_OPT_FLAG
|
||||||
$(call soong_config_set,art_module,art_debug_opt_flag,$(ART_DEBUG_OPT_FLAG))
|
$(call soong_config_set,art_module,art_debug_opt_flag,$(ART_DEBUG_OPT_FLAG))
|
||||||
endif
|
endif
|
||||||
|
Reference in New Issue
Block a user