StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove unused variable SKIP_BOOT_JARS_CHECK."

Browse Source
This commit is contained in:
Ulyana Trafimovich
2021-10-01 07:21:39 +00:00
committed by Gerrit Code Review
parent 472833c0dc ddec79ce54
commit 85ed8ef84f
2 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/main.mk
View File

@@ -113,15 +113,6 @@ ifeq (true,$(EMMA_INSTRUMENT_STATIC))
EMMA_INSTRUMENT := true EMMA_INSTRUMENT := true
endif 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 ifdef TARGET_ARCH_SUITE
# TODO(b/175577370): Enable this error. # TODO(b/175577370): Enable this error.
# $(error TARGET_ARCH_SUITE is not supported in kati/make builds) # $(error TARGET_ARCH_SUITE is not supported in kati/make builds)

1
core/soong_config.mk
View File

@@ -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_apps, $(TARGET_BUILD_APPS))
$(call add_json_bool, Unbundled_build_image, $(TARGET_BUILD_UNBUNDLED_IMAGE)) $(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, 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, Debuggable, $(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
$(call add_json_bool, Eng, $(filter eng,$(TARGET_BUILD_VARIANT))) $(call add_json_bool, Eng, $(filter eng,$(TARGET_BUILD_VARIANT)))