diff options
| author | Ying Wang <wangying@google.com> | 2015-01-21 17:30:21 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2015-01-21 17:30:21 -0800 |
| commit | 833b427d72c91c1d1b7f8ac99fb87a6742eb6f43 (patch) | |
| tree | e60da96d4ecf1c27b6eedd238f41473ea0e7e677 /core/base_rules.mk | |
| parent | 33360dd56925276e4526f5f52c26423e2bb1a670 (diff) | |
| download | build-833b427d72c91c1d1b7f8ac99fb87a6742eb6f43.zip build-833b427d72c91c1d1b7f8ac99fb87a6742eb6f43.tar.gz build-833b427d72c91c1d1b7f8ac99fb87a6742eb6f43.tar.bz2 | |
Explicit dependency on hostdex classes.jar.
Previously for hostdex Java libraries, we set up dependency on only
javalib.jar, which in turn is dependent on classes.jar.
But when jack is enabled there is no dependency of javalib.jar on
classes.jar. In commit b4c49cba57d classes.jar was universally added to
all host java library dependencies. That's unnecessary.
This change adds explicit dependency on classes.jar only for hostdex
modules.
On the other hand, if we switch checked module to $(full_classes_jack),
like what we did in commit 8bc90fd2d6ccf, we won't need this to fix jack
build either, because classes.jar isn't needed when you run checkbuild.
Change-Id: I92c0e4d621d266f6e6914ab2b4f20e5531af070f
Diffstat (limited to 'core/base_rules.mk')
| -rw-r--r-- | core/base_rules.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index 883f330..fee05dc 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -420,7 +420,8 @@ ifeq ($(USE_CORE_LIB_BOOTCLASSPATH),true) $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := -bootclasspath $(call java-lib-files,core-libart-hostdex,$(LOCAL_IS_HOST_MODULE)) full_shared_java_libs := $(call java-lib-files,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE)) -full_java_lib_deps := $(call java-lib-deps,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE)) +full_java_lib_deps := $(call java-lib-deps,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE)) \ + $(full_shared_java_libs) else $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := |