Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD
am: 062009ffd9
Change-Id: Iad49e8a9518b7350d42333d06f6e908a58d01c44
diff --git a/common/commons-cli/Android.mk b/common/commons-cli/Android.mk
index a997d06..e3dd2c7 100644
--- a/common/commons-cli/Android.mk
+++ b/common/commons-cli/Android.mk
@@ -22,3 +22,15 @@
commons-cli-1.2$(COMMON_JAVA_PACKAGE_SUFFIX)
include $(BUILD_HOST_PREBUILT)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := commons-cli-prebuilt
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := commons-cli-1.2.jar
+LOCAL_IS_HOST_MODULE := true
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_BUILT_MODULE_STEM := javalib.jar
+LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
+
+include $(BUILD_PREBUILT)
diff --git a/common/robolectric/Android.mk b/common/robolectric/Android.mk
index 1116a65..9f7e5d2 100644
--- a/common/robolectric/Android.mk
+++ b/common/robolectric/Android.mk
@@ -2,6 +2,7 @@
############################
# Adding the Robolectric .JAR prebuilts from this directory into a single target.
+# This is the one you probably want.
include $(CLEAR_VARS)
LOCAL_STATIC_JAVA_LIBRARIES := \
@@ -32,7 +33,8 @@
include $(CLEAR_VARS)
LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
- platform-mockito-prebuilt:lib/mockito-core-1.10.19.jar \
+ platform-deprecated-mockito-prebuilt:lib/mockito-core-1.10.19.jar \
+ platform-deprecated-objenesis-prebuilt:lib/objenesis-2.1.jar \
platform-robolectric-annotations:lib/robolectric-annotations-3.1.1.jar \
platform-robolectric-multidex:lib/shadows-multidex-3.1.1.jar \
platform-robolectric-resources:lib/robolectric-resources-3.1.1.jar \
@@ -61,13 +63,16 @@
include $(BUILD_PREBUILT)
############################
-# Target for a runnable Robolectric bundled with JUnit. This is the one you probably want.
+# Deprecated. Use platform-robolectric-prebuilt and mockito-robolectric-prebuilt instead
+#
+# Target for a runnable Robolectric bundled with JUnit.
include $(CLEAR_VARS)
LOCAL_MODULE := platform-system-robolectric
LOCAL_STATIC_JAVA_LIBRARIES := \
- platform-mockito-prebuilt \
+ platform-deprecated-mockito-prebuilt \
+ platform-deprecated-objenesis-prebuilt \
guava \
LOCAL_JAVA_LIBRARIES += \
diff --git a/common/robolectric/run_robotests.mk b/common/robolectric/run_robotests.mk
index be2a07c..b5b5306 100644
--- a/common/robolectric/run_robotests.mk
+++ b/common/robolectric/run_robotests.mk
@@ -77,9 +77,7 @@
$(my_robolectric_path)/maven-project-2.2.1.jar \
$(my_robolectric_path)/maven-repository-metadata-2.2.1.jar \
$(my_robolectric_path)/maven-settings-2.2.1.jar \
- $(my_robolectric_path)/mockito-core-1.10.19.jar \
$(my_robolectric_path)/nekohtml-1.9.6.2.jar \
- $(my_robolectric_path)/objenesis-2.1.jar \
$(my_robolectric_path)/plexus-container-default-1.0-alpha-9-stable-1.jar \
$(my_robolectric_path)/plexus-interpolation-1.11.jar \
$(my_robolectric_path)/plexus-utils-1.5.15.jar \
diff --git a/linux-x86/dtc/PREBUILT b/linux-x86/dtc/PREBUILT
new file mode 100644
index 0000000..b1dbacb
--- /dev/null
+++ b/linux-x86/dtc/PREBUILT
@@ -0,0 +1,4 @@
+The binaries in this prebuilt directory can be rebuilt using
+the source in external/dtc with build command "make dtc".
+
+dtc: artifact dtc/dtc from git_master@3883748 (https://android-build.googleplex.com/builds/submitted/3883748/angler-userdebug_fastbuild3b_linux/latest)
diff --git a/linux-x86/dtc/dtc b/linux-x86/dtc/dtc
new file mode 100755
index 0000000..6c2b46d
--- /dev/null
+++ b/linux-x86/dtc/dtc
Binary files differ
diff --git a/linux-x86/libufdt/PREBUILT b/linux-x86/libufdt/PREBUILT
new file mode 100644
index 0000000..9dd0e21
--- /dev/null
+++ b/linux-x86/libufdt/PREBUILT
@@ -0,0 +1,14 @@
+The binary extract_dtb in this prebuilt directory can be rebuilt using
+the source in system/libufdt with build command "make extract_dtb".
+
+The binary mkdtimg in this prebuilt directory can be rebuilt using
+the source in system/libufdt with build command "make mkdtimg".
+
+The binary ufdt_apply_overlay in this prebuilt directory can be rebuilt using
+the source in system/libufdt with build command "make ufdt_apply_overlay_host".
+
+extract_dtb: artifact libufdt/extract_dtb from git_master@3883748 (https://android-build.googleplex.com/builds/submitted/3883748/angler-userdebug_fastbuild3b_linux/latest)
+
+mkdtimg: artifact libufdt/mkdtimg from git_master@3883748 (https://android-build.googleplex.com/builds/submitted/3883748/angler-userdebug_fastbuild3b_linux/latest)
+
+ufdt_apply_overlay: artifact libufdt/ufdt_apply_overlay from git_master@3883748 (https://android-build.googleplex.com/builds/submitted/3883748/angler-userdebug_fastbuild3b_linux/latest)
diff --git a/linux-x86/libufdt/extract_dtb b/linux-x86/libufdt/extract_dtb
new file mode 100755
index 0000000..df2f40b
--- /dev/null
+++ b/linux-x86/libufdt/extract_dtb
Binary files differ
diff --git a/linux-x86/libufdt/mkdtimg b/linux-x86/libufdt/mkdtimg
new file mode 100755
index 0000000..7aed3c5
--- /dev/null
+++ b/linux-x86/libufdt/mkdtimg
Binary files differ
diff --git a/linux-x86/libufdt/ufdt_apply_overlay b/linux-x86/libufdt/ufdt_apply_overlay
new file mode 100755
index 0000000..8e8faba
--- /dev/null
+++ b/linux-x86/libufdt/ufdt_apply_overlay
Binary files differ
