From cfa292e1dad184648bf673167f3f35b4fb34fc93 Mon Sep 17 00:00:00 2001 From: Piotr Jastrzebski Date: Tue, 17 Feb 2015 16:58:52 +0000 Subject: Add core-oj to the list of core library jars. With some core classes moved to separate core-oj jar we need to use the new jar. (cherry-picked from f898cda2f499b14f92bc7fb75f44110cdec7654f) Change-Id: Ica148f11bcc77f57d22944ff78c501611a293167 --- tools/layoutlib/Android.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'tools/layoutlib/Android.mk') diff --git a/tools/layoutlib/Android.mk b/tools/layoutlib/Android.mk index 61ddb04bc08c..53bfc1581e53 100644 --- a/tools/layoutlib/Android.mk +++ b/tools/layoutlib/Android.mk @@ -30,6 +30,9 @@ LOCAL_JAVACFLAGS := -source 6 -target 6 built_framework_dep := $(call java-lib-deps,framework) built_framework_classes := $(call java-lib-files,framework) +built_oj_dep := $(call java-lib-deps,core-oj) +built_oj_classes := $(call java-lib-files,core-oj) + built_core_dep := $(call java-lib-deps,core-libart) built_core_classes := $(call java-lib-files,core-libart) @@ -56,7 +59,8 @@ LOCAL_BUILT_MODULE_STEM := javalib.jar include $(BUILD_SYSTEM)/base_rules.mk ####################################### -$(LOCAL_BUILT_MODULE): $(built_core_dep) \ +$(LOCAL_BUILT_MODULE): $(built_oj_dep) \ + $(built_core_dep) \ $(built_framework_dep) \ $(built_ext_dep) \ $(built_ext_data) \ @@ -69,6 +73,7 @@ $(LOCAL_BUILT_MODULE): $(built_core_dep) \ $(hide) ls -l $(built_framework_classes) $(hide) java -ea -jar $(built_layoutlib_create_jar) \ $@ \ + $(built_oj_classes) \ $(built_core_classes) \ $(built_framework_classes) \ $(built_ext_classes) \ -- cgit v1.2.3-59-g8ed1b