Merge "Remove rules for building dex with dx"

    $(addprefix -ix , $(PRIVATE_EMMA_COVERAGE_FILTER))

endef

#TODO: use a smaller -Xmx value for most libraries;

#      only core.jar and framework.jar need a heap this big.

define transform-classes.jar-to-dex

@echo "target Dex: $(PRIVATE_MODULE)"

@mkdir -p $(dir $@)

$(hide) rm -f $(dir $@)classes*.dex

$(hide) $(DX) \

    -JXms16M -JXmx2048M \

    --dex --output=$(dir $@) \

    $(if $(NO_OPTIMIZE_DX), \

        --no-optimize) \

    $(if $(GENERATE_DEX_DEBUG), \

	    --debug --verbose \

	    --dump-to=$(@:.dex=.lst) \

	    --dump-width=1000) \

    $(PRIVATE_DX_FLAGS) \

    $<

endef

# Create a mostly-empty .jar file that we'll add to later.

# The MacOS jar tool doesn't like creating empty jar files,

# so we need to give it something.

	$(hide) $(ACP) -fp $< $@

ifndef LOCAL_JACK_ENABLED

$(built_dex): PRIVATE_INTERMEDIATES_DIR := $(intermediates.COMMON)

$(built_dex): PRIVATE_DX_FLAGS := $(LOCAL_DX_FLAGS)

$(built_dex): $(full_classes_jar) $(DX)

	$(transform-classes.jar-to-dex)

$(LOCAL_BUILT_MODULE): PRIVATE_DEX_FILE := $(built_dex)

$(LOCAL_BUILT_MODULE): PRIVATE_SOURCE_ARCHIVE := $(full_classes_jarjar_jar)

ifeq ($(LOCAL_EMMA_INSTRUMENT),true)

$(built_dex_intermediate): PRIVATE_DX_FLAGS += --no-locals

endif

$(built_dex_intermediate): $(full_classes_proguard_jar) $(DX)

	$(transform-classes.jar-to-dex)

endif # LOCAL_JACK_ENABLED is disabled

$(built_dex): $(built_dex_intermediate) | $(ACP)