Merge "bpfmt -w Android.bp"
am: dd9feb8b67
Change-Id: I93c27c2dc3c4a4d8bf7cb783c449e285486bcc31
diff --git a/common/m2/Android.bp b/common/m2/Android.bp
index b3fa3f5..5f74255 100644
--- a/common/m2/Android.bp
+++ b/common/m2/Android.bp
@@ -13,165 +13,165 @@
// limitations under the License.
java_import {
- name: "asm-commons-prebuilt-jar",
- jars: ["repository/org/ow2/asm/asm-commons/5.0.1/asm-commons-5.0.1.jar"],
- sdk_version: "current",
- // host_supported: true, See version conflict comment below.
+ name: "asm-commons-prebuilt-jar",
+ jars: ["repository/org/ow2/asm/asm-commons/5.0.1/asm-commons-5.0.1.jar"],
+ sdk_version: "current",
+ // host_supported: true, See version conflict comment below.
}
java_import {
- name: "asm-prebuilt-jar",
- jars: ["repository/org/ow2/asm/asm/5.0.1/asm-5.0.1.jar"],
- sdk_version: "current",
- // host_supported: true, See version conflict comment below.
+ name: "asm-prebuilt-jar",
+ jars: ["repository/org/ow2/asm/asm/5.0.1/asm-5.0.1.jar"],
+ sdk_version: "current",
+ // host_supported: true, See version conflict comment below.
}
java_import {
- name: "asm-tree-prebuilt-jar",
- jars: ["repository/org/ow2/asm/asm-tree/5.0.1/asm-tree-5.0.1.jar"],
- sdk_version: "current",
- // host_supported: true, See version conflict comment below.
+ name: "asm-tree-prebuilt-jar",
+ jars: ["repository/org/ow2/asm/asm-tree/5.0.1/asm-tree-5.0.1.jar"],
+ sdk_version: "current",
+ // host_supported: true, See version conflict comment below.
}
java_import {
- name: "byte-buddy-prebuilt-jar",
- jars: ["repository/net/bytebuddy/byte-buddy/1.6.5/byte-buddy-1.6.5.jar"],
- sdk_version: "current",
+ name: "byte-buddy-prebuilt-jar",
+ jars: ["repository/net/bytebuddy/byte-buddy/1.6.5/byte-buddy-1.6.5.jar"],
+ sdk_version: "current",
}
java_import {
- name: "gson-prebuilt-jar",
- jars: ["repository/com/google/code/gson/gson/2.8.0/gson-2.8.0.jar"],
- sdk_version: "current",
- host_supported: true,
+ name: "gson-prebuilt-jar",
+ jars: ["repository/com/google/code/gson/gson/2.8.0/gson-2.8.0.jar"],
+ sdk_version: "current",
+ host_supported: true,
}
java_import {
- name: "mockito2-prebuilt-jar",
- jars: ["repository/org/mockito/mockito-core/2.7.6/mockito-core-2.7.6.jar"],
- sdk_version: "current",
+ name: "mockito2-prebuilt-jar",
+ jars: ["repository/org/mockito/mockito-core/2.7.6/mockito-core-2.7.6.jar"],
+ sdk_version: "current",
}
java_import {
- name: "objenesis-prebuilt-jar",
- jars: ["repository/org/objenesis/objenesis/2.5/objenesis-2.5.jar"],
+ name: "objenesis-prebuilt-jar",
+ jars: ["repository/org/objenesis/objenesis/2.5/objenesis-2.5.jar"],
}
java_import {
- name: "squareup-haha-prebuilt",
- jars: ["repository/com/squareup/haha/haha/2.0.2/haha-2.0.2.jar"],
- sdk_version: "current",
+ name: "squareup-haha-prebuilt",
+ jars: ["repository/com/squareup/haha/haha/2.0.2/haha-2.0.2.jar"],
+ sdk_version: "current",
}
java_import {
- name: "truth-prebuilt-jar",
- jars: ["repository/com/google/truth/truth/0.42/truth-0.42.jar"],
- sdk_version: "current",
- host_supported: true,
+ name: "truth-prebuilt-jar",
+ jars: ["repository/com/google/truth/truth/0.42/truth-0.42.jar"],
+ sdk_version: "current",
+ host_supported: true,
}
java_import {
name: "assertj-core-prebuilt-jar",
jars: ["repository/org/assertj/assertj-core/3.8.0/assertj-core-3.8.0.jar"],
- host_supported: true
+ host_supported: true,
}
// These versions differ. Consider updating and unifying.
java_import_host {
- name: "asm-commons-prebuilt-host-jar",
- jars: ["repository/org/ow2/asm/asm-commons/6.0/asm-commons-6.0.jar"],
+ name: "asm-commons-prebuilt-host-jar",
+ jars: ["repository/org/ow2/asm/asm-commons/6.0/asm-commons-6.0.jar"],
}
java_import_host {
- name: "asm-prebuilt-host-jar",
- jars: ["repository/org/ow2/asm/asm/6.0/asm-6.0.jar"],
+ name: "asm-prebuilt-host-jar",
+ jars: ["repository/org/ow2/asm/asm/6.0/asm-6.0.jar"],
}
java_import_host {
- name: "asm-tree-prebuilt-host-jar",
- jars: ["repository/org/ow2/asm/asm-tree/6.0/asm-tree-6.0.jar"],
+ name: "asm-tree-prebuilt-host-jar",
+ jars: ["repository/org/ow2/asm/asm-tree/6.0/asm-tree-6.0.jar"],
}
// These are host-only prebuilts.
java_import_host {
- name: "asm-analysis-prebuilt-host-jar",
- jars: ["repository/org/ow2/asm/asm-analysis/6.0/asm-analysis-6.0.jar"],
+ name: "asm-analysis-prebuilt-host-jar",
+ jars: ["repository/org/ow2/asm/asm-analysis/6.0/asm-analysis-6.0.jar"],
}
java_import_host {
- name: "asm-util-prebuilt-host-jar",
- jars: ["repository/org/ow2/asm/asm-util/6.0/asm-util-6.0.jar"],
+ name: "asm-util-prebuilt-host-jar",
+ jars: ["repository/org/ow2/asm/asm-util/6.0/asm-util-6.0.jar"],
}
java_import_host {
- name: "javapoet-prebuilt-jar",
- jars: ["repository/com/squareup/javapoet/1.8.0/javapoet-1.8.0.jar"],
+ name: "javapoet-prebuilt-jar",
+ jars: ["repository/com/squareup/javapoet/1.8.0/javapoet-1.8.0.jar"],
}
java_import_host {
- name: "protobuf-java-prebuilt-jar",
- jars: ["repository/com/google/protobuf/protobuf-java/3.0.2/protobuf-java-3.0.2.jar"],
+ name: "protobuf-java-prebuilt-jar",
+ jars: ["repository/com/google/protobuf/protobuf-java/3.0.2/protobuf-java-3.0.2.jar"],
}
java_import_host {
- name: "protobuf-java-util-prebuilt-jar",
- jars: ["repository/com/google/protobuf/protobuf-java-util/3.0.2/protobuf-java-util-3.0.2.jar"],
+ name: "protobuf-java-util-prebuilt-jar",
+ jars: ["repository/com/google/protobuf/protobuf-java-util/3.0.2/protobuf-java-util-3.0.2.jar"],
}
java_import_host {
- name: "trove-prebuilt",
- jars: ["repository/net/sf/trove4j/trove4j/1.1/trove4j-1.1.jar"],
+ name: "trove-prebuilt",
+ jars: ["repository/net/sf/trove4j/trove4j/1.1/trove4j-1.1.jar"],
}
java_import_host {
- name: "jna-prebuilt",
- jars: ["repository/net/java/dev/jna/jna/3.4.0/jna-3.4.0.jar"],
+ name: "jna-prebuilt",
+ jars: ["repository/net/java/dev/jna/jna/3.4.0/jna-3.4.0.jar"],
}
// Compatibility wrappers. TODO: Remove.
java_library_host {
- name: "truth-prebuilt-host-jar",
- static_libs: ["truth-prebuilt-jar"],
+ name: "truth-prebuilt-host-jar",
+ static_libs: ["truth-prebuilt-jar"],
}
// Combined libraries.
java_library_static {
- name: "mockito-robolectric-prebuilt",
- static_libs: [
- "byte-buddy-prebuilt-jar",
- "mockito2-prebuilt-jar",
- "objenesis-prebuilt-jar",
- ],
- sdk_version: "current",
+ name: "mockito-robolectric-prebuilt",
+ static_libs: [
+ "byte-buddy-prebuilt-jar",
+ "mockito2-prebuilt-jar",
+ "objenesis-prebuilt-jar",
+ ],
+ sdk_version: "current",
}
java_library_static {
- name: "truth-prebuilt",
- static_libs: [
- "truth-prebuilt-jar",
- "guava",
- ],
- host_supported: true,
- sdk_version: "current",
+ name: "truth-prebuilt",
+ static_libs: [
+ "truth-prebuilt-jar",
+ "guava",
+ ],
+ host_supported: true,
+ sdk_version: "current",
}
// Wrapper for the above. TODO: Remove.
java_library_host {
- name: "truth-host-prebuilt",
- static_libs: ["truth-prebuilt"],
+ name: "truth-host-prebuilt",
+ static_libs: ["truth-prebuilt"],
}
java_library_host {
- name: "protobuf-java-host-prebuilt",
- static_libs: [
- "gson-prebuilt-jar",
- "protobuf-java-prebuilt-jar",
- "protobuf-java-util-prebuilt-jar",
- ],
+ name: "protobuf-java-host-prebuilt",
+ static_libs: [
+ "gson-prebuilt-jar",
+ "protobuf-java-prebuilt-jar",
+ "protobuf-java-util-prebuilt-jar",
+ ],
}
java_import_host {
