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

Commit a06d64be authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Gerrit Code Review
Browse files

Merge "Ensure ART module prebuilts aren't used in sanitizer builds."

parents 95f52132 52d0490d

core/android_soong_config_vars.mk

+3 −0
Original line number Original line Diff line number Diff line
@@ -38,6 +38,9 @@ ifneq (,$(filter true,$(NATIVE_COVERAGE) $(CLANG_COVERAGE))) 
  # aren't built with instrumentation.

  # aren't built with instrumentation.

  # TODO(b/172480617): Find another solution for this.

  # TODO(b/172480617): Find another solution for this.

  SOONG_CONFIG_art_module_source_build := true

  SOONG_CONFIG_art_module_source_build := true

else ifneq (,$(SANITIZE_TARGET)$(SANITIZE_HOST))

  # Prebuilts aren't built with sanitizers either.

  SOONG_CONFIG_art_module_source_build := true

else

else

  # This sets the default for building ART APEXes from source rather than

  # This sets the default for building ART APEXes from source rather than

  # prebuilts (in packages/modules/ArtPrebuilt and prebuilt/module_sdk/art) in

  # prebuilts (in packages/modules/ArtPrebuilt and prebuilt/module_sdk/art) in