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

Commit 72bc59ce authored by Ying Wang's avatar Ying Wang
Browse files

Remove rmtypedefs from the build system. 

We don't need to run rmtypedefs in javac compilation now, because the
runtime libraries are compiled by only jack, which takes care of
rmtypedefs by itself.

Bug: 27828139
Change-Id: Ie480ae5aead8f3f58f956978fc4a05c28a35dec6
parent 49b524cb

core/config.mk

+0 −1
Original line number Diff line number Diff line
@@ -558,7 +558,6 @@ DEFAULT_JACK_EXTRA_ARGS += --verbose error 


PROGUARD := external/proguard/bin/proguard.sh

JAVATAGS := build/tools/java-event-log-tags.py

RMTYPEDEFS := $(HOST_OUT_EXECUTABLES)/rmtypedefs

APPEND2SIMG := $(HOST_OUT_EXECUTABLES)/append2simg

VERITY_SIGNER := $(HOST_OUT_EXECUTABLES)/verity_signer

BUILD_VERITY_TREE := $(HOST_OUT_EXECUTABLES)/build_verity_tree

core/definitions.mk

+0 −1
Original line number Diff line number Diff line
@@ -1945,7 +1945,6 @@ $(if $(PRIVATE_JAR_PACKAGES), \ 
$(if $(PRIVATE_JAR_EXCLUDE_PACKAGES), $(hide) rm -rf \

    $(foreach pkg, $(PRIVATE_JAR_EXCLUDE_PACKAGES), \

        $(PRIVATE_CLASS_INTERMEDIATES_DIR)/$(subst .,/,$(pkg))))

$(if $(PRIVATE_RMTYPEDEFS), $(hide) $(RMTYPEDEFS) -v $(PRIVATE_CLASS_INTERMEDIATES_DIR))

$(if $(PRIVATE_JAR_MANIFEST), \

    $(hide) sed -e "s/%BUILD_NUMBER%/$(BUILD_NUMBER_FROM_FILE)/" \

            $(PRIVATE_JAR_MANIFEST) > $(dir $@)/manifest.mf && \

core/java.mk

+0 −4
Original line number Diff line number Diff line
@@ -409,10 +409,6 @@ layers_file := $(addprefix $(LOCAL_PATH)/, $(LOCAL_JAVA_LAYERS_FILE)) 
$(full_classes_compiled_jar): PRIVATE_JAVA_LAYERS_FILE := $(layers_file)

$(full_classes_compiled_jar): PRIVATE_WARNINGS_ENABLE := $(LOCAL_WARNINGS_ENABLE)



ifdef LOCAL_RMTYPEDEFS

$(full_classes_compiled_jar): | $(RMTYPEDEFS)

endif



# Compile the java files to a .jar file.

# This intentionally depends on java_sources, not all_java_sources.

# Deps for generated source files must be handled separately,