Merge "Remove LOCAL_PROGUARD_ENABLED := nosystem" (2c2cb338) · Commits · e / os / android_build

core/clear_vars.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -194,7 +194,7 @@ LOCAL_PREBUILT_OBJ_FILES:=
		LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES:=
		LOCAL_PREBUILT_STRIP_COMMENTS:=
		LOCAL_PRIVILEGED_MODULE:=
		# '',full,custom,nosystem,disabled,obfuscation,optimization
		# '',full,custom,disabled,obfuscation,optimization
		LOCAL_PROGUARD_ENABLED:=
		LOCAL_PROGUARD_FLAG_FILES:=
		LOCAL_PROGUARD_FLAGS:=

+2 −5

Original line number	Diff line number	Diff line
		@@ -593,7 +593,7 @@ $(eval $(call copy-one-file,$(full_classes_pre_proguard_jar),$(intermediates.COM

		# Run proguard if necessary
		ifdef LOCAL_PROGUARD_ENABLED
		ifneq ($(filter-out full custom nosystem obfuscation optimization,$(LOCAL_PROGUARD_ENABLED)),)
		ifneq ($(filter-out full custom obfuscation optimization,$(LOCAL_PROGUARD_ENABLED)),)
		$(warning while processing: $(LOCAL_MODULE))
		$(error invalid value for LOCAL_PROGUARD_ENABLED: $(LOCAL_PROGUARD_ENABLED))
		endif
		@@ -631,9 +631,7 @@ legacy_proguard_flags += -printmapping $(proguard_dictionary)

		common_proguard_flags := -forceprocessing

		common_proguard_flag_files :=
		ifeq ($(filter nosystem,$(LOCAL_PROGUARD_ENABLED)),)
		common_proguard_flag_files += $(BUILD_SYSTEM)/proguard.flags
		common_proguard_flag_files := $(BUILD_SYSTEM)/proguard.flags
		ifneq ($(LOCAL_INSTRUMENTATION_FOR)$(filter tests,$(LOCAL_MODULE_TAGS)),)
		common_proguard_flags += -dontshrink # don't shrink tests by default
		endif # test package
		@@ -684,7 +682,6 @@ $(full_classes_proguard_jar) : $(link_instr_intermediates_dir.COMMON)/proguard.c

		endif # no obfuscation
		endif # LOCAL_INSTRUMENTATION_FOR
		endif # LOCAL_PROGUARD_ENABLED is not nosystem

		proguard_flag_files := $(addprefix $(LOCAL_PATH)/, $(LOCAL_PROGUARD_FLAG_FILES))
		ifeq ($(USE_R8),true)