Merge "Add error_prone_annotations-2.0.18 prebuilts"
diff --git a/common/layoutlib_api/PREBUILT b/common/layoutlib_api/PREBUILT
index 50f942f..c111a1c 100644
--- a/common/layoutlib_api/PREBUILT
+++ b/common/layoutlib_api/PREBUILT
@@ -1,4 +1,4 @@
The object in this prebuilt directory can be rebuilt from
platform/tools/base/layoutlib_api/
-From: https://android.googlesource.com/platform/tools/base/+/60737ae80db39b99db2a9da3aa93ca7042e9fbc8
+From: https://android.googlesource.com/platform/tools/base/+/e76e82faa103006187af42e3c8d6c2212b9970ad
diff --git a/common/layoutlib_api/layoutlib_api-prebuilt.jar b/common/layoutlib_api/layoutlib_api-prebuilt.jar
index cf6513d..a9b6ed0 100644
--- a/common/layoutlib_api/layoutlib_api-prebuilt.jar
+++ b/common/layoutlib_api/layoutlib_api-prebuilt.jar
Binary files differ
diff --git a/common/layoutlib_api/layoutlib_api-sources.jar b/common/layoutlib_api/layoutlib_api-sources.jar
index 7ecf865..15bb418 100644
--- a/common/layoutlib_api/layoutlib_api-sources.jar
+++ b/common/layoutlib_api/layoutlib_api-sources.jar
Binary files differ
diff --git a/common/ninepatch/PREBUILT b/common/ninepatch/PREBUILT
index 921b29a..6e4bc1e 100644
--- a/common/ninepatch/PREBUILT
+++ b/common/ninepatch/PREBUILT
@@ -1,4 +1,4 @@
The object in this prebuilt directory can be rebuilt from
- platform/sdk/ninepatch/
+ platform/tools/base/ninepatch
-From: http://android.git.kernel.org/?p=platform/sdk.git;a=commit;h=795a4ad26824b0e553ca49161a8b4999b8181f8d
+From: https://android.googlesource.com/platform/tools/base/+/9bb80dcd51e8e953590473a469a67b3ec8f2b736
diff --git a/common/ninepatch/ninepatch-prebuilt.jar b/common/ninepatch/ninepatch-prebuilt.jar
index cf3ced3..5e010da 100644
--- a/common/ninepatch/ninepatch-prebuilt.jar
+++ b/common/ninepatch/ninepatch-prebuilt.jar
Binary files differ
diff --git a/common/ub-janktesthelper/Android.mk b/common/ub-janktesthelper/Android.mk
index 4903a92..edb69a4 100644
--- a/common/ub-janktesthelper/Android.mk
+++ b/common/ub-janktesthelper/Android.mk
@@ -19,6 +19,7 @@
LOCAL_MODULE := ub-janktesthelper
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := ub-janktesthelper.jar
+LOCAL_SDK_VERSION := 23
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
LOCAL_UNINSTALLABLE_MODULE := true
diff --git a/common/ub-uiautomator/Android.mk b/common/ub-uiautomator/Android.mk
index 3ae97b2..6daa973 100644
--- a/common/ub-uiautomator/Android.mk
+++ b/common/ub-uiautomator/Android.mk
@@ -19,6 +19,7 @@
LOCAL_MODULE := ub-uiautomator
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := ub-uiautomator.jar
+LOCAL_SDK_VERSION := 18
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
LOCAL_UNINSTALLABLE_MODULE := true