diff options
| -rw-r--r-- | core/base_rules.mk | 2 | ||||
| -rw-r--r-- | core/config.mk | 2 | ||||
| -rw-r--r-- | core/droiddoc.mk | 4 | ||||
| -rw-r--r-- | core/host_dalvik_java_library.mk | 2 | ||||
| -rw-r--r-- | core/host_dalvik_static_java_library.mk | 2 | ||||
| -rw-r--r-- | core/tasks/cts.mk | 2 | ||||
| -rw-r--r-- | target/product/core_base.mk | 2 | ||||
| -rw-r--r-- | target/product/core_minimal.mk | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index de82f8c..39904e2 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -403,7 +403,7 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_STATIC_JAVA_LIBRARIES := $(full_static_ja # be up-to-date. ifdef 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)) +$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := -bootclasspath $(call java-lib-deps,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)) diff --git a/core/config.mk b/core/config.mk index 8e22fef..0ecb5c5 100644 --- a/core/config.mk +++ b/core/config.mk @@ -523,7 +523,7 @@ endif # allow overriding default Java libraries on a per-target basis ifeq ($(TARGET_DEFAULT_JAVA_LIBRARIES),) - TARGET_DEFAULT_JAVA_LIBRARIES := core core-junit ext framework framework2 + TARGET_DEFAULT_JAVA_LIBRARIES := core-libart core-junit ext framework framework2 endif TARGET_CPU_SMP ?= true diff --git a/core/droiddoc.mk b/core/droiddoc.mk index d5ddf08..90ef0b3 100644 --- a/core/droiddoc.mk +++ b/core/droiddoc.mk @@ -65,8 +65,8 @@ ifneq ($(LOCAL_SDK_VERSION),) $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, sdk_v$(LOCAL_SDK_VERSION)) endif else - LOCAL_JAVA_LIBRARIES := core ext framework framework2 $(LOCAL_JAVA_LIBRARIES) - $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, core) + LOCAL_JAVA_LIBRARIES := core-libart ext framework framework2 $(LOCAL_JAVA_LIBRARIES) + $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, core-libart) endif # LOCAL_SDK_VERSION LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES)) diff --git a/core/host_dalvik_java_library.mk b/core/host_dalvik_java_library.mk index a79d64d..e15bde2 100644 --- a/core/host_dalvik_java_library.mk +++ b/core/host_dalvik_java_library.mk @@ -27,7 +27,7 @@ include $(BUILD_SYSTEM)/host_java_library_common.mk ####################################### ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true) - LOCAL_JAVA_LIBRARIES += core-hostdex + LOCAL_JAVA_LIBRARIES += core-libart-hostdex endif full_classes_compiled_jar := $(intermediates.COMMON)/classes-full-debug.jar diff --git a/core/host_dalvik_static_java_library.mk b/core/host_dalvik_static_java_library.mk index 05c4b16..3ae74e4 100644 --- a/core/host_dalvik_static_java_library.mk +++ b/core/host_dalvik_static_java_library.mk @@ -21,7 +21,7 @@ # USE_CORE_LIB_BOOTCLASSPATH := true -LOCAL_JAVA_LIBRARIES += core-hostdex +LOCAL_JAVA_LIBRARIES += core-libart-hostdex include $(BUILD_SYSTEM)/host_java_library.mk diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk index f991a9e..49daa71 100644 --- a/core/tasks/cts.mk +++ b/core/tasks/cts.mk @@ -100,7 +100,7 @@ $(hide) java -Xmx256M \ $(PRIVATE_PARAMS) CollectAllTests $(1) $(2) $(3) "$(4)" $(5) $(6) endef -CORE_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,core,,COMMON) +CORE_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,core-libart,,COMMON) CONSCRYPT_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,conscrypt,,COMMON) BOUNCYCASTLE_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,bouncycastle,,COMMON) APACHEXML_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,apache-xml,,COMMON) diff --git a/target/product/core_base.mk b/target/product/core_base.mk index 8161434..529b5f2 100644 --- a/target/product/core_base.mk +++ b/target/product/core_base.mk @@ -67,7 +67,7 @@ PRODUCT_PACKAGES += \ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk) # Override the PRODUCT_BOOT_JARS set in core_minimal.mk. The order matters. PRODUCT_BOOT_JARS := \ - core \ + core-libart \ conscrypt \ okhttp \ core-junit \ diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk index 9cd2903..ec51ea4 100644 --- a/target/product/core_minimal.mk +++ b/target/product/core_minimal.mk @@ -61,7 +61,7 @@ PRODUCT_PACKAGES += \ # The order of PRODUCT_BOOT_JARS matters. PRODUCT_BOOT_JARS := \ - core \ + core-libart \ conscrypt \ okhttp \ core-junit \ |