Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22313f2b authored by Yohann Roussel's avatar Yohann Roussel
Browse files

Remove rules for building dex with dx 

This is just to ensure no dex file is built with dx any more, cleaning
of the build rules from Jack optionality is still to be done.

Bug: 27218410
Change-Id: Iea2c66802b6c64c52690ad9d6d487bdce5f50b79
parent 10baeeeb

core/definitions.mk

+0 −19
Original line number Diff line number Diff line
@@ -2181,25 +2181,6 @@ $(hide) java -classpath $(EMMA_JAR) emma instr -outmode fullcopy -outfile \ 
    $(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.

core/host_dalvik_java_library.mk

+0 −4
Original line number Diff line number Diff line
@@ -102,10 +102,6 @@ $(full_classes_jar): $(full_classes_jarjar_jar) | $(ACP) 
	$(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)

core/java.mk

+0 −2
Original line number Diff line number Diff line
@@ -598,8 +598,6 @@ $(built_dex_intermediate): PRIVATE_DX_FLAGS := $(LOCAL_DX_FLAGS) 
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)