Merge "Add platformtestprotos to prebuilts." into sc-dev am: 11cba379af

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/14823688

Change-Id: I7138074ca06b7ba1dc502453b4c936d194758750

3 files changed, 14 insertions, 5 deletions

diff --git a/common/frameworks/Android.bp b/common/frameworks/Android.bp
index 384f3e09..00e40947 100644
--- a/common/frameworks/Android.bp
+++ b/common/frameworks/Android.bp
@@ -20,3 +20,8 @@ java_import_host {
     name: "platformprotos",
     jars: ["platformprotos-prebuilt.jar"],
 }
+
+java_import_host {
+    name: "platformtestprotos",
+    jars: ["platformtestprotos-prebuilt.jar"],
+}
diff --git a/common/frameworks/PREBUILT b/common/frameworks/PREBUILT
index 0124b2ff..718cf37b 100644
--- a/common/frameworks/PREBUILT
+++ b/common/frameworks/PREBUILT
@@ -1,9 +1,13 @@
-The object in this prebuilt directory can be built from
+The objects in this prebuilt directory can be built from
 	platform/frameworks/base
-From commit I757f06b69eefe26dbbbaa1bbde1abeca1b6a62f4.
+
+platformprotos-prebuilt.jar:
+Built from commit I757f06b69eefe26dbbbaa1bbde1abeca1b6a62f4.
 First AOSP build containing the change is aosp-master@5989172.
 
-Note: Before dropping the platformprotos-prebuilt.jar, please
-run the following command to strip the jar manifest file,
-which causes hidden dependency on jars in the Class-Path.
+platformtestprotos-prebuilt.jar:
+Built from change I82386a6c8a5e6ddf42d8377148001f4ede2f297f
+
+Note: Before dropping the jars, please run the following command to strip the
+jar manifest file, which causes hidden dependency on jars in the Class-Path.
 $ zip -d platformprotos-prebuilt.jar META-INF/MANIFEST.MF
diff --git a/common/frameworks/platformtestprotos-prebuilt.jar b/common/frameworks/platformtestprotos-prebuilt.jar
new file mode 100644
index 00000000..77b94194
--- /dev/null
+++ b/common/frameworks/platformtestprotos-prebuilt.jar