Merge "Add dependencies for files in LOCAL_PROGUARD_FLAGS" (2a36c97e) · Commits · e / os / android_build

core/clear_vars.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -221,6 +221,7 @@ LOCAL_PRODUCT_SERVICES_MODULE :=
		LOCAL_PROGUARD_ENABLED:=
		LOCAL_PROGUARD_FLAG_FILES:=
		LOCAL_PROGUARD_FLAGS:=
		LOCAL_PROGUARD_FLAGS_DEPS:=
		LOCAL_PROPRIETARY_MODULE:=
		LOCAL_PROTOC_FLAGS:=
		# lite(default),micro,nano,stream,full,nanopb-c,nanopb-c-enable_malloc,nanopb-c-16bit,nanopb-c-enable_malloc-16bit,nanopb-c-32bit,nanopb-c-enable_malloc-32bit

core/java.mk

+3 −3

Original line number	Diff line number	Diff line
		@@ -470,6 +470,8 @@ endif # LOCAL_INSTRUMENTATION_FOR
		proguard_flag_files := $(addprefix $(LOCAL_PATH)/, $(LOCAL_PROGUARD_FLAG_FILES))
		proguard_flag_files += $(addprefix $(LOCAL_PATH)/, $(LOCAL_R8_FLAG_FILES))
		LOCAL_PROGUARD_FLAGS += $(addprefix -include , $(proguard_flag_files))
		LOCAL_PROGUARD_FLAGS_DEPS += $(proguard_flag_files)
		proguard_flag_files :=

		ifdef LOCAL_TEST_MODULE_TO_PROGUARD_WITH
		extra_input_jar := $(call intermediates-dir-for,APPS,$(LOCAL_TEST_MODULE_TO_PROGUARD_WITH),,COMMON)/classes.jar
		@@ -481,8 +483,6 @@ ifneq ($(filter obfuscation,$(LOCAL_PROGUARD_ENABLED)),)
		$(built_dex_intermediate): .KATI_IMPLICIT_OUTPUTS := $(proguard_dictionary) $(proguard_configuration)
		endif

		else # LOCAL_PROGUARD_ENABLED not defined
		proguard_flag_files :=
		endif # LOCAL_PROGUARD_ENABLED defined

		ifneq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true)
		@@ -492,7 +492,7 @@ ifdef LOCAL_PROGUARD_ENABLED
		$(built_dex_intermediate): PRIVATE_EXTRA_INPUT_JAR := $(extra_input_jar)
		$(built_dex_intermediate): PRIVATE_PROGUARD_FLAGS := $(legacy_proguard_flags) $(common_proguard_flags) $(LOCAL_PROGUARD_FLAGS)
		$(built_dex_intermediate): PRIVATE_PROGUARD_DICTIONARY := $(proguard_dictionary)
		$(built_dex_intermediate) : $(full_classes_pre_proguard_jar) $(extra_input_jar) $(my_proguard_sdk_raise) $(common_proguard_flag_files) $(proguard_flag_files) $(legacy_proguard_lib_deps) $(R8_COMPAT_PROGUARD)
		$(built_dex_intermediate) : $(full_classes_pre_proguard_jar) $(extra_input_jar) $(my_proguard_sdk_raise) $(common_proguard_flag_files) $(legacy_proguard_lib_deps) $(R8_COMPAT_PROGUARD) $(LOCAL_PROGUARD_FLAGS_DEPS)
		$(transform-jar-to-dex-r8)
		else # !LOCAL_PROGUARD_ENABLED
		$(built_dex_intermediate): PRIVATE_D8_LIBS := $(full_java_bootclasspath_libs) $(full_shared_java_header_libs)

core/java_library.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,7 @@ ifeq (true,$(EMMA_INSTRUMENT_STATIC))
		LOCAL_STATIC_JAVA_LIBRARIES += jacocoagent
		# Exclude jacoco classes from proguard
		LOCAL_PROGUARD_FLAGS += -include $(BUILD_SYSTEM)/proguard.jacoco.flags
		LOCAL_PROGUARD_FLAGS_DEPS += $(BUILD_SYSTEM)/proguard.jacoco.flags
		endif # LOCAL_EMMA_INSTRUMENT
		endif # EMMA_INSTRUMENT_STATIC
		else

core/package_internal.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -253,6 +253,7 @@ ifeq ($(need_compile_res),true)
		endif # need_compile_res
		endif # !custom
		LOCAL_PROGUARD_FLAGS := $(addprefix -include ,$(proguard_options_file)) $(LOCAL_PROGUARD_FLAGS)
		LOCAL_PROGUARD_FLAGS_DEPS += $(proguard_options_file)

		ifeq (true,$(EMMA_INSTRUMENT))
		ifndef LOCAL_EMMA_INSTRUMENT
		@@ -272,6 +273,7 @@ ifneq ($(LOCAL_SRC_FILES)$(LOCAL_SRCJARS)$(LOCAL_STATIC_JAVA_LIBRARIES)$(LOCAL_S
		LOCAL_STATIC_JAVA_LIBRARIES += jacocoagent
		# Exclude jacoco classes from proguard
		LOCAL_PROGUARD_FLAGS += -include $(BUILD_SYSTEM)/proguard.jacoco.flags
		LOCAL_PROGUARD_FLAGS_DEPS += $(BUILD_SYSTEM)/proguard.jacoco.flags
		endif # Contains java code
		else
		ifdef LOCAL_SDK_VERSION
		@@ -282,6 +284,7 @@ ifneq ($(LOCAL_SRC_FILES)$(LOCAL_STATIC_JAVA_LIBRARIES)$(LOCAL_SOURCE_FILES_ALL_
		LOCAL_STATIC_JAVA_LIBRARIES += jacocoagent
		# Exclude jacoco classes from proguard
		LOCAL_PROGUARD_FLAGS += -include $(BUILD_SYSTEM)/proguard.jacoco.flags
		LOCAL_PROGUARD_FLAGS_DEPS += $(BUILD_SYSTEM)/proguard.jacoco.flags
		endif # Contains java code
		endif # TARGET_BUILD_APPS
		endif # LOCAL_SDK_VERSION

core/static_java_library.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,7 @@ ifneq ($(filter custom,$(LOCAL_PROGUARD_ENABLED)),custom)
		endif

		LOCAL_PROGUARD_FLAGS := $(addprefix -include ,$(proguard_options_file)) $(LOCAL_PROGUARD_FLAGS)
		LOCAL_PROGUARD_FLAGS_DEPS += $(proguard_options_file)

		R_file_stamp := $(intermediates.COMMON)/src/R.stamp
		LOCAL_INTERMEDIATE_TARGETS += $(R_file_stamp)