Merge "Support dx generating multiple dex files." (400c48cc) · Commits · e / os / android_build

core/definitions.mk

+3 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1591,9 +1591,10 @@ endef
	define transform-classes.jar-to-dex		define transform-classes.jar-to-dex
	@echo "target Dex: $(PRIVATE_MODULE)"		@echo "target Dex: $(PRIVATE_MODULE)"
	@mkdir -p $(dir $@)		@mkdir -p $(dir $@)
			$(hide) rm -f $(dir $@)/classes*.dex
	$(hide) $(DX) \		$(hide) $(DX) \
	$(if $(findstring windows,$(HOST_OS)),,-JXms16M -JXmx2048M) \		$(if $(findstring windows,$(HOST_OS)),,-JXms16M -JXmx2048M) \
	--dex --output=$@ \		--dex --output=$(dir $@) \
	$(incremental_dex) \		$(incremental_dex) \
	$(if $(NO_OPTIMIZE_DX), \		$(if $(NO_OPTIMIZE_DX), \
	--no-optimize) \		--no-optimize) \
	@@ -1653,11 +1654,7 @@ endef

	#TODO: update the manifest to point to the dex file		#TODO: update the manifest to point to the dex file
	define add-dex-to-package		define add-dex-to-package
	$(if $(filter classes.dex,$(notdir $(PRIVATE_DEX_FILE))),\		$(hide) zip -qj $@ $(dir $(PRIVATE_DEX_FILE))/classes*.dex
	$(hide) zip -qj $@ $(PRIVATE_DEX_FILE),\
	$(hide) _adtp_classes_dex=$(dir $(PRIVATE_DEX_FILE))classes.dex; \
	cp $(PRIVATE_DEX_FILE) $$_adtp_classes_dex && \
	zip -qj $@ $$_adtp_classes_dex && rm -f $$_adtp_classes_dex)
	endef		endef

	# Add java resources added by the current module.		# Add java resources added by the current module.

core/java.mk

+7 −5

Original line number	Original line	Diff line number	Diff line
	@@ -82,10 +82,10 @@ intermediates.COMMON := $(call local-intermediates-dir,COMMON)
	# Choose leaf name for the compiled jar file.		# Choose leaf name for the compiled jar file.
	ifeq ($(LOCAL_EMMA_INSTRUMENT),true)		ifeq ($(LOCAL_EMMA_INSTRUMENT),true)
	full_classes_compiled_jar_leaf := classes-no-debug-var.jar		full_classes_compiled_jar_leaf := classes-no-debug-var.jar
	built_dex_intermediate_leaf := classes-no-local.dex		built_dex_intermediate_leaf := no-local
	else		else
	full_classes_compiled_jar_leaf := classes-full-debug.jar		full_classes_compiled_jar_leaf := classes-full-debug.jar
	built_dex_intermediate_leaf := classes-with-local.dex		built_dex_intermediate_leaf := with-local
	endif		endif

	LOCAL_PROGUARD_ENABLED:=$(strip $(LOCAL_PROGUARD_ENABLED))		LOCAL_PROGUARD_ENABLED:=$(strip $(LOCAL_PROGUARD_ENABLED))
	@@ -115,12 +115,12 @@ emma_intermediates_dir := $(intermediates.COMMON)/emma_out
	# only the output directory can be changed		# only the output directory can be changed
	full_classes_emma_jar := $(emma_intermediates_dir)/lib/$(jarjar_leaf)		full_classes_emma_jar := $(emma_intermediates_dir)/lib/$(jarjar_leaf)
	full_classes_proguard_jar := $(intermediates.COMMON)/$(proguard_jar_leaf)		full_classes_proguard_jar := $(intermediates.COMMON)/$(proguard_jar_leaf)
	built_dex_intermediate := $(intermediates.COMMON)/$(built_dex_intermediate_leaf)		built_dex_intermediate := $(intermediates.COMMON)/$(built_dex_intermediate_leaf)/classes.dex
	full_classes_stubs_jar := $(intermediates.COMMON)/stubs.jar		full_classes_stubs_jar := $(intermediates.COMMON)/stubs.jar

	# full_classes_jar and built_dex are cleared below, and re-set if we really need them.		# full_classes_jar and built_dex are cleared below, and re-set if we really need them.
	full_classes_jar := $(intermediates.COMMON)/classes.jar		full_classes_jar := $(intermediates.COMMON)/classes.jar
	built_dex := $(intermediates.COMMON)/$(built_dex_leaf)		built_dex := $(intermediates.COMMON)/$(built_dex_leaf)/classes.dex

	LOCAL_INTERMEDIATE_TARGETS += \		LOCAL_INTERMEDIATE_TARGETS += \
	$(full_classes_compiled_jar) \		$(full_classes_compiled_jar) \
	@@ -446,7 +446,9 @@ $(built_dex_intermediate): $(full_classes_proguard_jar) $(DX)
	$(transform-classes.jar-to-dex)		$(transform-classes.jar-to-dex)
	$(built_dex): $(built_dex_intermediate) \| $(ACP)		$(built_dex): $(built_dex_intermediate) \| $(ACP)
	@echo Copying: $@		@echo Copying: $@
	$(hide) $(ACP) -fp $< $@		$(hide) mkdir -p $(dir $@)
			$(hide) rm -f $(dir $@)/classes*.dex
			$(hide) $(ACP) -fp $(dir $<)/classes*.dex $(dir $@)
	ifneq ($(GENERATE_DEX_DEBUG),)		ifneq ($(GENERATE_DEX_DEBUG),)
	$(install-dex-debug)		$(install-dex-debug)
	endif		endif