Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfa292e1 authored by Piotr Jastrzebski's avatar Piotr Jastrzebski Committed by Narayan Kamath
Browse files

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
parent 4133dee9

Android.mk

+3 −2
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ LOCAL_INTERMEDIATE_SOURCES := \ 
			$(framework_res_source_path)/com/android/internal/R.java



LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_JAVA_LIBRARIES := core-libart conscrypt okhttp core-junit bouncycastle ext

LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt okhttp core-junit bouncycastle ext



LOCAL_MODULE := framework
@@ -719,6 +719,7 @@ framework_docs_LOCAL_INTERMEDIATE_SOURCES := \ 
	$(framework_res_source_path)/com/android/internal/R.java



framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES := \

	core-oj \

	core-libart \

	conscrypt \

	bouncycastle \
@@ -1104,7 +1105,7 @@ include $(CLEAR_VARS) 
LOCAL_SRC_FILES := $(ext_src_files)



LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_JAVA_LIBRARIES := core-libart

LOCAL_JAVA_LIBRARIES := core-oj core-libart

LOCAL_STATIC_JAVA_LIBRARIES := libphonenumber-platform

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE := ext

test-runner/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ include $(CLEAR_VARS) 


LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_JAVA_LIBRARIES := core-libart core-junit framework

LOCAL_JAVA_LIBRARIES := core-oj core-libart core-junit framework

LOCAL_STATIC_JAVA_LIBRARIES := junit-runner



LOCAL_MODULE:= android.test.runner

tools/layoutlib/Android.mk

+6 −1
Original line number Diff line number Diff line
@@ -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) \