Merge "Add jack's argument files to prerequisites" (06dbe198) · Commits · e / os / android_build

core/config.mk

+3 −1

Original line number	Diff line number	Diff line
		@@ -546,9 +546,11 @@ TUNE2FS := $(HOST_OUT_EXECUTABLES)/tune2fs$(HOST_EXECUTABLE_SUFFIX)
		JARJAR := $(HOST_OUT_JAVA_LIBRARIES)/jarjar.jar

		ifneq ($(ANDROID_JACK_EXTRA_ARGS),)
		JACK_DEFAULT_ARGS :=
		DEFAULT_JACK_EXTRA_ARGS := $(ANDROID_JACK_EXTRA_ARGS)
		else
		DEFAULT_JACK_EXTRA_ARGS := @$(BUILD_SYSTEM)/jack-default.args
		JACK_DEFAULT_ARGS := $(BUILD_SYSTEM)/jack-default.args
		DEFAULT_JACK_EXTRA_ARGS := @$(JACK_DEFAULT_ARGS)
		endif
		# Turn off jack warnings by default.
		DEFAULT_JACK_EXTRA_ARGS += --verbose error

core/host_dalvik_java_library.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_MIN_SDK_VERSION := $(PLATFORM_JACK_M

		jack_all_deps := $(java_sources) $(java_resource_sources) $(full_jack_deps) \
		$(jar_manifest_file) $(proto_java_sources_file_stamp) \
		$(LOCAL_ADDITIONAL_DEPENDENCIES) $(JACK)
		$(LOCAL_ADDITIONAL_DEPENDENCIES) $(JACK_DEFAULT_ARGS) $(JACK)

		ifneq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true)
		$(built_dex): PRIVATE_CLASSES_JACK := $(full_classes_jack)

core/java.mk

+14 −6

Original line number	Diff line number	Diff line
		@@ -463,18 +463,25 @@ jack_proguard_flags := -printmapping $(jack_dictionary)

		common_proguard_flags := -forceprocessing

		common_proguard_flag_files :=
		ifeq ($(filter nosystem,$(LOCAL_PROGUARD_ENABLED)),)
		common_proguard_flags += -include $(BUILD_SYSTEM)/proguard.flags
		common_proguard_flag_files += $(BUILD_SYSTEM)/proguard.flags
		ifeq ($(LOCAL_EMMA_INSTRUMENT),true)
		common_proguard_flags += -include $(BUILD_SYSTEM)/proguard.jacoco.flags
		common_proguard_flag_files += $(BUILD_SYSTEM)/proguard.jacoco.flags
		endif
		# If this is a test package, add proguard keep flags for tests.
		ifneq ($(LOCAL_INSTRUMENTATION_FOR)$(filter tests,$(LOCAL_MODULE_TAGS)),)
		common_proguard_flags += -include $(BUILD_SYSTEM)/proguard_tests.flags
		common_proguard_flag_files += $(BUILD_SYSTEM)/proguard_tests.flags
		ifeq ($(filter shrinktests,$(LOCAL_PROGUARD_ENABLED)),)
		common_proguard_flags += -dontshrink # don't shrink tests by default
		endif # shrinktests
		endif # test package
		ifneq ($(common_proguard_flag_files),)
		common_proguard_flags += $(addprefix -include , $(common_proguard_flag_files))
		# This is included from $(BUILD_SYSTEM)/proguard.flags
		common_proguard_flag_files += $(BUILD_SYSTEM)/proguard_basic_keeps.flags
		endif

		ifeq ($(filter obfuscation,$(LOCAL_PROGUARD_ENABLED)),)
		# By default no obfuscation
		common_proguard_flags += -dontobfuscate
		@@ -525,7 +532,7 @@ extra_input_jar :=
		endif
		$(full_classes_proguard_jar): PRIVATE_EXTRA_INPUT_JAR := $(extra_input_jar)
		$(full_classes_proguard_jar): PRIVATE_PROGUARD_FLAGS := $(legacy_proguard_flags) $(common_proguard_flags) $(LOCAL_PROGUARD_FLAGS)
		$(full_classes_proguard_jar) : $(full_classes_jar) $(extra_input_jar) $(my_support_library_sdk_raise) $(proguard_flag_files) \| $(PROGUARD)
		$(full_classes_proguard_jar) : $(full_classes_jar) $(extra_input_jar) $(my_support_library_sdk_raise) $(common_proguard_flag_files) $(proguard_flag_files) \| $(PROGUARD)
		$(call transform-jar-to-proguard)

		else # LOCAL_PROGUARD_ENABLED not defined
		@@ -607,9 +614,10 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_FLAGS := $(GLOBAL_JAVAC_DEBUG_FLAGS)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_VERSION := $(LOCAL_JACK_VERSION)

		jack_all_deps := $(java_sources) $(java_resource_sources) $(full_jack_deps) \
		$(jar_manifest_file) $(layers_file) $(RenderScript_file_stamp) $(proguard_flag_files) \
		$(jar_manifest_file) $(layers_file) $(RenderScript_file_stamp) \
		$(common_proguard_flag_files) $(proguard_flag_files) \
		$(proto_java_sources_file_stamp) $(LOCAL_ADDITIONAL_DEPENDENCIES) $(LOCAL_JARJAR_RULES) \
		$(JACK)
		$(JACK_DEFAULT_ARGS) $(JACK)

		$(jack_check_timestamp): $(jack_all_deps)
		@echo Checking build with Jack: $@

core/prebuilt_internal.mk

+2 −1

Original line number	Diff line number	Diff line
		@@ -397,7 +397,8 @@ ifneq ($(prebuilt_module_is_dex_javalib),true)
		$(intermediates.COMMON)/classes.jack : PRIVATE_JACK_FLAGS:=$(LOCAL_JACK_FLAGS)
		$(intermediates.COMMON)/classes.jack : PRIVATE_JACK_MIN_SDK_VERSION := 1
		$(intermediates.COMMON)/classes.jack : $(my_src_jar) \
		$(LOCAL_ADDITIONAL_DEPENDENCIES) $(JACK) \| setup-jack-server
		$(LOCAL_ADDITIONAL_DEPENDENCIES) $(JACK_DEFAULT_ARGS) $(JACK) \
		\| setup-jack-server
		$(transform-jar-to-jack)

		# Update timestamps of .toc files for prebuilts so dependents will be