From 9a6a326ccd975af6aa27f5d4043dfd04d85f9c16 Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Fri, 26 Oct 2012 16:25:05 -0700 Subject: [PATCH] Fix broken dependencies with the layers.txt files. When a device java module was using the layers.txt files, and that device java module depenended on a host java module, when building the host java module, the layer checker tried to run and would fail, complaining about the host module. The problem was that since the value wasn't set for the host module, it would be inherited from its dependent module (a make "feature") and would cause the layer checker to run. So this change makes it explicitly set PRIVATE_JAVA_LAYERS_FILE for host java modules too. Change-Id: Ifbc085295d0995a2da5d6d63d8cb379ef2631cc4 --- core/host_java_library.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/host_java_library.mk b/core/host_java_library.mk index b14bd9e78..c938d57ae 100644 --- a/core/host_java_library.mk +++ b/core/host_java_library.mk @@ -43,6 +43,10 @@ endif # LOCAL_BUILD_HOST_DEX include $(BUILD_SYSTEM)/base_rules.mk +# The layers file allows you to enforce a layering between java packages. +# Run build/tools/java-layers.py for more details. +layers_file := $(addprefix $(LOCAL_PATH)/, $(LOCAL_JAVA_LAYERS_FILE)) + ifeq ($(LOCAL_BUILD_HOST_DEX),true) $(LOCAL_INTERMEDIATE_TARGETS): \ PRIVATE_CLASS_INTERMEDIATES_DIR := $(intermediates.COMMON)/classes @@ -51,6 +55,7 @@ $(LOCAL_INTERMEDIATE_TARGETS): \ $(cleantarget): PRIVATE_CLEAN_FILES += $(intermediates.COMMON) +$(full_classes_compiled_jar): PRIVATE_JAVA_LAYERS_FILE := $(layers_file) $(full_classes_compiled_jar): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS) $(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_FILES := $(full_classes_compiled_jar): $(java_sources) $(java_resource_sources) $(full_java_lib_deps) \ @@ -91,6 +96,7 @@ endif else $(LOCAL_BUILT_MODULE): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS) $(LOCAL_BUILT_MODULE): PRIVATE_JAR_EXCLUDE_FILES := +$(LOCAL_BUILT_MODULE): PRIVATE_JAVA_LAYERS_FILE := $(layers_file) $(LOCAL_BUILT_MODULE): $(java_sources) $(java_resource_sources) $(full_java_lib_deps) \ $(jar_manifest_file) $(LOCAL_ADDITIONAL_DEPENDENCIES) $(transform-host-java-to-package) -- 2.11.0