Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f432d87c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add soong config variable to exclude extracted apks for... 

Merge "Add soong config variable to exclude extracted apks for PrebuiltGmsCore" into main am: 83f593a1

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



Change-Id: I2d6304a7b09dc2ca23fd6c8212b93c5f5b7fd55a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7bfc4f89 83f593a1

core/android_soong_config_vars.mk

+11 −0
Original line number Diff line number Diff line
@@ -310,6 +310,17 @@ $(call soong_config_set_bool,google_graphics,board_uses_hwc_services,$(if $(filt 
# Variables for controlling android.hardware.composer.hwc3-service.pixel

$(call soong_config_set,google_graphics,board_hwc_version,$(BOARD_HWC_VERSION))



# Flag ExcludeExtractApk is to support "extract_apk" property for the following conditions.

ifneq ($(WITH_DEXPREOPT),true)

  $(call soong_config_set_bool,PrebuiltGmsCore,ExcludeExtractApk,true)

endif

ifeq ($(DONT_DEXPREOPT_PREBUILTS),true)

  $(call soong_config_set_bool,PrebuiltGmsCore,ExcludeExtractApk,true)

endif

ifeq ($(WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY),true)

  $(call soong_config_set_bool,PrebuiltGmsCore,ExcludeExtractApk,true)

endif



# Variables for extra branches

# TODO(b/383238397): Use bootstrap_go_package to enable extra flags.

-include vendor/google/build/extra_soong_config_vars.mk

target/product/runtime_libart.mk

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ ifneq (,$(filter true,$(OVERRIDE_DISABLE_DEXOPT_ALL))) 
  # be too much of a problem for platform developers because a change to framework code should not

  # trigger dexpreopt for the ART boot image.

  WITH_DEXPREOPT_ART_BOOT_IMG_ONLY := true

  $(call soong_config_set_bool,PrebuiltGmsCore,ExcludeExtractApk,true)

endif



# Enable resolution of startup const strings.