Delete java-layers.py
There are no usages of LOCAL_JAVA_LAYERS_FILE, and java-layers.py was written in python 2. Bug: 203436762 Test: Presubmits Change-Id: I1be0f2547757a853e20811f28529479487037e94
This commit is contained in:
@@ -153,7 +153,6 @@ LOCAL_JAR_PROCESSOR:=
|
||||
LOCAL_JAR_PROCESSOR_ARGS:=
|
||||
LOCAL_JAVACFLAGS:=
|
||||
LOCAL_JAVA_LANGUAGE_VERSION:=
|
||||
LOCAL_JAVA_LAYERS_FILE:=
|
||||
LOCAL_JAVA_LIBRARIES:=
|
||||
LOCAL_JAVA_RESOURCE_DIRS:=
|
||||
LOCAL_JAVA_RESOURCE_FILES:=
|
||||
|
@@ -2604,8 +2604,6 @@ $(hide) if [ -s $(PRIVATE_JAVA_SOURCE_LIST) $(if $(PRIVATE_SRCJARS),-o -s $(PRIV
|
||||
$(if $(PRIVATE_SRCJARS),\@$(PRIVATE_SRCJAR_LIST_FILE)) \
|
||||
|| ( rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR) ; exit 41 ) \
|
||||
fi
|
||||
$(if $(PRIVATE_JAVA_LAYERS_FILE), $(hide) build/make/tools/java-layers.py \
|
||||
$(PRIVATE_JAVA_LAYERS_FILE) @$(PRIVATE_JAVA_SOURCE_LIST),)
|
||||
$(if $(PRIVATE_JAR_EXCLUDE_FILES), $(hide) find $(PRIVATE_CLASS_INTERMEDIATES_DIR) \
|
||||
-name $(word 1, $(PRIVATE_JAR_EXCLUDE_FILES)) \
|
||||
$(addprefix -o -name , $(wordlist 2, 999, $(PRIVATE_JAR_EXCLUDE_FILES))) \
|
||||
|
@@ -56,10 +56,6 @@ ALL_MODULES.$(my_register_name).SRCS := $(ALL_MODULES.$(my_register_name).SRCS)
|
||||
|
||||
include $(BUILD_SYSTEM)/java_common.mk
|
||||
|
||||
# The layers file allows you to enforce a layering between java packages.
|
||||
# Run build/make/tools/java-layers.py for more details.
|
||||
layers_file := $(addprefix $(LOCAL_PATH)/, $(LOCAL_JAVA_LAYERS_FILE))
|
||||
|
||||
# List of dependencies for anything that needs all java sources in place
|
||||
java_sources_deps := \
|
||||
$(java_sources) \
|
||||
@@ -72,7 +68,6 @@ $(java_source_list_file): $(java_sources_deps)
|
||||
|
||||
# TODO(b/143658984): goma can't handle the --system argument to javac.
|
||||
#$(full_classes_compiled_jar): .KATI_NINJA_POOL := $(GOMA_POOL)
|
||||
$(full_classes_compiled_jar): PRIVATE_JAVA_LAYERS_FILE := $(layers_file)
|
||||
$(full_classes_compiled_jar): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS) $(annotation_processor_flags)
|
||||
$(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_FILES :=
|
||||
$(full_classes_compiled_jar): PRIVATE_JAR_PACKAGES :=
|
||||
|
@@ -200,10 +200,6 @@ ifdef full_classes_jar
|
||||
$(eval $(call copy-one-file,$(full_classes_jar),$(full_classes_stubs_jar)))
|
||||
ALL_MODULES.$(my_register_name).STUBS := $(full_classes_stubs_jar)
|
||||
|
||||
# The layers file allows you to enforce a layering between java packages.
|
||||
# Run build/make/tools/java-layers.py for more details.
|
||||
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)
|
||||
|
||||
# Compile the java files to a .jar file.
|
||||
|
Reference in New Issue
Block a user