From 72bc59ce8b805c399beeda941cf836bdce749658 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Thu, 24 Mar 2016 12:25:56 -0700 Subject: [PATCH] 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 --- core/config.mk | 1 - core/definitions.mk | 1 - core/java.mk | 4 ---- 3 files changed, 6 deletions(-) diff --git a/core/config.mk b/core/config.mk index a68c5b206..3a433513d 100644 --- a/core/config.mk +++ b/core/config.mk @@ -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 diff --git a/core/definitions.mk b/core/definitions.mk index 6650f6015..e73f9d3da 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -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 && \ diff --git a/core/java.mk b/core/java.mk index 811f7ca41..6fb16eaf9 100644 --- a/core/java.mk +++ b/core/java.mk @@ -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,