From e616f344315968a95ff5846a1a9c9448d2e1b9d4 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 28 Dec 2017 09:43:41 -0800 Subject: [PATCH] Remove LOCAL_PROGUARD_ENABLED := nosystem None of the system options are controversial, and there are no longer any users of nosystem, so remove it. Test: m checkbuild Change-Id: Id1b946d83688d266ca2942c02c97e8b404c3755b --- core/clear_vars.mk | 2 +- core/java.mk | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 06518ee41..e9c07dfa8 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -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:= diff --git a/core/java.mk b/core/java.mk index 04f7a72d0..ee071c932 100644 --- a/core/java.mk +++ b/core/java.mk @@ -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)