diff options
| author | 2014-06-19 02:03:35 +0000 | |
|---|---|---|
| committer | 2014-06-19 02:03:35 +0000 | |
| commit | f8077cf2d7ee55dbf02ec0c65a05db7e5c2fabfc (patch) | |
| tree | 66cd762a9d753b596361b2f4720dca7d2b459a89 | |
| parent | 802aaf3b9d029e8f6fdb1bf0a81758484801d330 (diff) | |
| parent | 8e21e21550eddce01ad06fdf05b342993bf44c6a (diff) | |
am 8e21e215: Merge "Switch from core to core-libart"
* commit '8e21e21550eddce01ad06fdf05b342993bf44c6a':
Switch from core to core-libart
| -rw-r--r-- | Android.mk | 10 | ||||
| -rw-r--r-- | test-runner/Android.mk | 2 | ||||
| -rw-r--r-- | tools/layoutlib/Android.mk | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/Android.mk b/Android.mk index 1db4365c552f..614e76d71a2e 100644 --- a/Android.mk +++ b/Android.mk @@ -283,7 +283,7 @@ LOCAL_INTERMEDIATE_SOURCES := \ $(framework_res_source_path)/com/android/internal/R.java 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 @@ -489,9 +489,9 @@ framework_docs_LOCAL_INTERMEDIATE_SOURCES := \ $(framework_res_source_path)/com/android/internal/R.java framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES := \ - bouncycastle \ + core-libart \ conscrypt \ - core \ + bouncycastle \ okhttp \ ext \ framework \ @@ -529,7 +529,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ -since $(SRC_API_DIR)/17.txt 17 \ -since $(SRC_API_DIR)/18.txt 18 \ -since $(SRC_API_DIR)/19.txt 19 \ - -werror -hide 113 \ + -werror -hide 111 -hide 113 \ -overview $(LOCAL_PATH)/core/java/overview.html framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR:= \ @@ -796,7 +796,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(ext_src_files) LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core +LOCAL_JAVA_LIBRARIES := core-libart LOCAL_JAVA_RESOURCE_DIRS := $(ext_res_dirs) LOCAL_MODULE_TAGS := optional LOCAL_MODULE := ext diff --git a/test-runner/Android.mk b/test-runner/Android.mk index 0d9e4f10e607..b12795c737c5 100644 --- a/test-runner/Android.mk +++ b/test-runner/Android.mk @@ -20,7 +20,7 @@ include $(CLEAR_VARS) 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_MODULE:= android.test.runner diff --git a/tools/layoutlib/Android.mk b/tools/layoutlib/Android.mk index 1fa9615f6620..5d03842e7f7f 100644 --- a/tools/layoutlib/Android.mk +++ b/tools/layoutlib/Android.mk @@ -28,8 +28,8 @@ include $(CLEAR_VARS) built_framework_dep := $(call java-lib-deps,framework-base) built_framework_classes := $(call java-lib-files,framework-base) -built_core_dep := $(call java-lib-deps,core) -built_core_classes := $(call java-lib-files,core) +built_core_dep := $(call java-lib-deps,core-libart) +built_core_classes := $(call java-lib-files,core-libart) built_ext_dep := $(call java-lib-deps,ext) built_ext_classes := $(call java-lib-files,ext) |