Merge "Snap for 7224597 from 4ad2bf41adffdb2b559281bc1c4f6da9ec28d4e0 to sdk-release" into sdk-release
diff --git a/common/ddmlib/PREBUILT b/common/ddmlib/PREBUILT
index b47a84a..bc345c8 100644
--- a/common/ddmlib/PREBUILT
+++ b/common/ddmlib/PREBUILT
@@ -1,9 +1,7 @@
The object in this prebuilt directory can be built from
platform/tools/base
-From the commit I3a3c6e2b8c68025629969c207a331638629a8b49
-
-Jar is obtained from git_studio-master-dev@7165546
+Jar is obtained from studio_linux@7192265[] - git_studio-master-dev
Note: Before dropping the ddmlib-prebuilt.jar, please run
the following command to strip the jar manifest file,
diff --git a/common/ddmlib/ddmlib-prebuilt.jar b/common/ddmlib/ddmlib-prebuilt.jar
index e9ba962..6ea6697 100644
--- a/common/ddmlib/ddmlib-prebuilt.jar
+++ b/common/ddmlib/ddmlib-prebuilt.jar
Binary files differ
diff --git a/common/incfs/Android.bp b/common/incfs/Android.bp
new file mode 100644
index 0000000..3e6fb27
--- /dev/null
+++ b/common/incfs/Android.bp
@@ -0,0 +1,10 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+java_import {
+ name: "libincfs-prebuilt",
+ jars: ["libincfs-prebuilt.jar"],
+ installable: true,
+ host_supported: true,
+}
diff --git a/common/incfs/OWNERS b/common/incfs/OWNERS
new file mode 100644
index 0000000..ce823cf
--- /dev/null
+++ b/common/incfs/OWNERS
@@ -0,0 +1,5 @@
+# Owners due to the impact of libincfs update on Incremental Cts tests
+alexbuy@google.com
+schfan@google.com
+toddke@google.com
+zyy@google.com
diff --git a/common/incfs/README.md b/common/incfs/README.md
new file mode 100644
index 0000000..1687b99
--- /dev/null
+++ b/common/incfs/README.md
@@ -0,0 +1,9 @@
+The object in this prebuilt directory can be built from
+ platform/tools/base
+
+Jar is obtained from studio_linux@7190098[] - git_studio-master-dev
+
+Note: Before dropping the libincfs-prebuilt.jar, please run
+the following command to strip the jar manifest file,
+which causes hidden dependency on jars in the Class-Path.
+$ zip -d libincfs-prebuilt.jar META-INF/MANIFEST.MF
diff --git a/common/incfs/libincfs-prebuilt.jar b/common/incfs/libincfs-prebuilt.jar
new file mode 100644
index 0000000..0be2a55
--- /dev/null
+++ b/common/incfs/libincfs-prebuilt.jar
Binary files differ
