diff options
| author | Narayan Kamath <narayan@google.com> | 2013-10-28 13:20:52 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2013-11-25 10:17:53 +0000 |
| commit | 40dae1fefa25ac4f901f975b7cdfdc57b4b7052c (patch) | |
| tree | 8874d19319aee6ed6185bf2f1ef6da75e2c2c2f8 /core/base_rules.mk | |
| parent | b9041a45b1f030d3e374420aa95e44f4c3029fb4 (diff) | |
| download | build-40dae1fefa25ac4f901f975b7cdfdc57b4b7052c.zip build-40dae1fefa25ac4f901f975b7cdfdc57b4b7052c.tar.gz build-40dae1fefa25ac4f901f975b7cdfdc57b4b7052c.tar.bz2 | |
Rework the generation of host java libraries.
We currently have two types of host libraries, those
meant for the host VM (Sun, OpenJDK etc.) and those meant
for a host dalvik build. The former need to be compiled
against the host standard libraries and the latter need
to be compiled against libcore. This change introduces
two new build rules to complement the existing the existing
host rules.
BUILD_HOST_DALVIK_JAVA_LIBRARY : Build a java library for
a host build of dalvik. Bootclasspath will be set to a host
build of libcore.
BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY : Build a static java
library for a host build of dalvik. Bootclasspath will be set
to a host build of libcore.
This change also removes support for the LOCAL_BUILD_HOST_DEX
flag, which is now unnecessary.
bug: 8992787
(cherry picked from commit 0dd273a3f68364045c0e8bdcc10a4ecd3c07b745)
Change-Id: I3569fff8eaa4d26d55fcc317bd98471f55d74c14
Diffstat (limited to 'core/base_rules.mk')
| -rw-r--r-- | core/base_rules.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index 783524d..ca61f88 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -393,8 +393,8 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_STATIC_JAVA_LIBRARIES := $(full_static_ja # to guarantee that the files in full_java_libs will # be up-to-date. ifdef LOCAL_IS_HOST_MODULE -ifeq ($(LOCAL_BUILD_HOST_DEX),true) -$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := -bootclasspath $(call java-lib-files,core-hostdex,$(LOCAL_IS_HOST_MODULE)) +ifeq ($(USE_CORE_LIB_BOOTCLASSPATH),true) +$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := -bootclasspath $(call java-lib-deps,core-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)) |