From 314e0c854c1f2f5b9431dd9a879006b896093705 Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Wed, 18 Jun 2014 15:11:01 -0700 Subject: Switch from core to core-libart Bug: 14298175 Change-Id: I6003d2a3f9c5e254632e8a67bfee0c11ea0348f3 --- Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index 7ccbb8e..b60d5ff 100644 --- a/Android.mk +++ b/Android.mk @@ -39,7 +39,7 @@ ifneq ($(TARGET_BUILD_PDK),true) LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(android_bcprov_src_files) LOCAL_JAVACFLAGS := -encoding UTF-8 - LOCAL_JAVA_LIBRARIES := conscrypt core + LOCAL_JAVA_LIBRARIES := core-libart conscrypt LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk @@ -51,7 +51,7 @@ ifneq ($(TARGET_BUILD_PDK),true) LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(android_bcprov_src_files) LOCAL_JAVACFLAGS := -encoding UTF-8 - LOCAL_JAVA_LIBRARIES := conscrypt core + LOCAL_JAVA_LIBRARIES := core-libart conscrypt LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_STATIC_JAVA_LIBRARY) -- cgit v1.2.3