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

Commit dbcae5ce authored by Brian Carlstrom's avatar Brian Carlstrom
Browse files

Switch from core to core-libart 

Bug: 14298175
Change-Id: I89db18bf3d88f9511cb2ad943c64ecdbaf09d96f
parent 88b37eda

Android.mk

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

			$(framework_res_source_path)/com/android/internal/R.java





LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt core core-junit ext okhttp

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





LOCAL_MODULE := framework-base

LOCAL_MODULE := framework-base
@@ -489,9 +489,9 @@ framework_docs_LOCAL_INTERMEDIATE_SOURCES := \ 
	$(framework_res_source_path)/com/android/internal/R.java

	$(framework_res_source_path)/com/android/internal/R.java





framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES := \

framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES := \

	bouncycastle \

	core-libart \

	conscrypt \

	conscrypt \

	core \

	bouncycastle \

	okhttp \

	okhttp \

	ext \

	ext \

	framework \

	framework \
@@ -529,7 +529,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ 
    -since $(SRC_API_DIR)/17.txt 17 \

    -since $(SRC_API_DIR)/17.txt 17 \

    -since $(SRC_API_DIR)/18.txt 18 \

    -since $(SRC_API_DIR)/18.txt 18 \

    -since $(SRC_API_DIR)/19.txt 19 \

    -since $(SRC_API_DIR)/19.txt 19 \

		-werror -hide 113 \

		-werror -hide 111 -hide 113 \

		-overview $(LOCAL_PATH)/core/java/overview.html

		-overview $(LOCAL_PATH)/core/java/overview.html





framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR:= \

framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR:= \
@@ -796,7 +796,7 @@ include $(CLEAR_VARS) 
LOCAL_SRC_FILES := $(ext_src_files)

LOCAL_SRC_FILES := $(ext_src_files)





LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_JAVA_LIBRARIES := core

LOCAL_JAVA_LIBRARIES := core-libart

LOCAL_JAVA_RESOURCE_DIRS := $(ext_res_dirs)

LOCAL_JAVA_RESOURCE_DIRS := $(ext_res_dirs)

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE := ext

LOCAL_MODULE := ext

test-runner/Android.mk

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




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

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





LOCAL_JAVA_LIBRARIES := core core-junit framework

LOCAL_JAVA_LIBRARIES := core-libart core-junit framework

LOCAL_STATIC_JAVA_LIBRARIES := junit-runner

LOCAL_STATIC_JAVA_LIBRARIES := junit-runner





LOCAL_MODULE:= android.test.runner

LOCAL_MODULE:= android.test.runner

tools/layoutlib/Android.mk

+2 −2
Original line number Original line Diff line number Diff line
@@ -28,8 +28,8 @@ include $(CLEAR_VARS) 
built_framework_dep := $(call java-lib-deps,framework-base)

built_framework_dep := $(call java-lib-deps,framework-base)

built_framework_classes := $(call java-lib-files,framework-base)

built_framework_classes := $(call java-lib-files,framework-base)





built_core_dep := $(call java-lib-deps,core)

built_core_dep := $(call java-lib-deps,core-libart)

built_core_classes := $(call java-lib-files,core)

built_core_classes := $(call java-lib-files,core-libart)





built_ext_dep := $(call java-lib-deps,ext)

built_ext_dep := $(call java-lib-deps,ext)

built_ext_classes := $(call java-lib-files,ext)

built_ext_classes := $(call java-lib-files,ext)