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

Commit 8f06d540 authored by Ulyana Trafimovich's avatar Ulyana Trafimovich Committed by Automerger Merge Worker
Browse files

Merge "Remove unused variable SKIP_BOOT_JARS_CHECK." am: 85ed8ef8 am:... 

Merge "Remove unused variable SKIP_BOOT_JARS_CHECK." am: 85ed8ef8 am: e6a4320c am: 166f4ff2 am: 3f84d318

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

Change-Id: Ibf36b293b84a2e85d327915af5768351dd9ce45a
parents 6b03f453 3f84d318

core/main.mk

+0 −9
Original line number Diff line number Diff line
@@ -115,15 +115,6 @@ ifeq (true,$(EMMA_INSTRUMENT_STATIC)) 
EMMA_INSTRUMENT := true

endif



ifeq (true,$(EMMA_INSTRUMENT))

# Adding the jacoco library can cause the inclusion of

# some typically banned classes

# So if the user didn't specify SKIP_BOOT_JARS_CHECK, enable it here

ifndef SKIP_BOOT_JARS_CHECK

SKIP_BOOT_JARS_CHECK := true

endif

endif



ifdef TARGET_ARCH_SUITE

  # TODO(b/175577370): Enable this error.

  # $(error TARGET_ARCH_SUITE is not supported in kati/make builds)

core/soong_config.mk

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ $(call add_json_bool, Unbundled_build, $(TARGET_BUILD_UNBUNDLE 
$(call add_json_bool, Unbundled_build_apps,              $(TARGET_BUILD_APPS))

$(call add_json_bool, Unbundled_build_image,             $(TARGET_BUILD_UNBUNDLED_IMAGE))

$(call add_json_bool, Always_use_prebuilt_sdks,          $(TARGET_BUILD_USE_PREBUILT_SDKS))

$(call add_json_bool, Skip_boot_jars_check,              $(SKIP_BOOT_JARS_CHECK))



$(call add_json_bool, Debuggable,                        $(filter userdebug eng,$(TARGET_BUILD_VARIANT)))

$(call add_json_bool, Eng,                               $(filter eng,$(TARGET_BUILD_VARIANT)))