Reformat .bp files
Bug: 179354495
Test: m nothing
Merged-In: Ie7ed8eddb08a575d5c32245827822b4115bcfba6
Change-Id: Ie7ed8eddb08a575d5c32245827822b4115bcfba6
(cherry picked from commit c9d11fc0b9dc2a1a1559d67f060b6e530ccef949)
diff --git a/Android.bp b/Android.bp
index d694623..9fd2d23 100644
--- a/Android.bp
+++ b/Android.bp
@@ -19,7 +19,7 @@
apex {
name: "com.android.sdkext",
- defaults: [ "com.android.sdkext-defaults" ],
+ defaults: ["com.android.sdkext-defaults"],
bootclasspath_fragments: ["com.android.sdkext-bootclasspath-fragment"],
binaries: [
"derive_classpath",
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index c0ddf19..9524bc0 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -1,4 +1,5 @@
[Builtin Hooks]
+bpfmt = true
clang_format = true
commit_msg_changeid_field = true
commit_msg_test_field = true
diff --git a/derive_sdk/Android.bp b/derive_sdk/Android.bp
index 78a1248..66ba7bc 100644
--- a/derive_sdk/Android.bp
+++ b/derive_sdk/Android.bp
@@ -26,7 +26,7 @@
"libbase",
"libmodules-utils-build",
"libprotobuf-cpp-lite",
- "libsdk_proto"
+ "libsdk_proto",
],
}
@@ -44,6 +44,7 @@
static_libs: ["libderive_sdk"],
}
+
cc_binary {
name: "derive_sdk",
defaults: ["derive_sdk_binary-defaults"],
diff --git a/framework/Android.bp b/framework/Android.bp
index 36463f5..29428e0 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -23,16 +23,16 @@
],
path: "java",
visibility: [
- "//frameworks/base", // For the "global" stubs.
+ "//frameworks/base", // For the "global" stubs.
"//packages/modules/SdkExtensions:__subpackages__",
],
}
java_sdk_library {
name: "framework-sdkextensions",
- srcs: [ ":framework-sdkextensions-sources" ],
+ srcs: [":framework-sdkextensions-sources"],
defaults: ["framework-module-defaults"],
- permitted_packages: [ "android.os.ext" ],
+ permitted_packages: ["android.os.ext"],
static_libs: ["modules-utils-build"],
jarjar_rules: "jarjar_rules.txt",
apex_available: [
diff --git a/gen_sdk/Android.bp b/gen_sdk/Android.bp
index a07100b..b74e73b 100644
--- a/gen_sdk/Android.bp
+++ b/gen_sdk/Android.bp
@@ -34,7 +34,7 @@
src: "gen_sdk_test.sh",
data: [
"extensions_db.textpb",
- "testdata/**/*"
+ "testdata/**/*",
],
data_bins: ["gen_sdk"],
test_suites: ["general-tests"],
diff --git a/testing/Android.bp b/testing/Android.bp
index 46c40e1..fedd3f7 100644
--- a/testing/Android.bp
+++ b/testing/Android.bp
@@ -19,7 +19,7 @@
apex_test {
name: "test_com.android.sdkext",
defaults: ["com.android.sdkext-defaults"],
- java_libs: [ "test_framework-sdkextensions" ],
+ java_libs: ["test_framework-sdkextensions"],
manifest: "test_manifest.json",
prebuilts: [
"sdkinfo_45",
@@ -43,8 +43,8 @@
genrule {
name: "sdkinfo_45_src",
- out: [ "sdkinfo.binarypb" ],
- tools: [ "gen_sdkinfo" ],
+ out: ["sdkinfo.binarypb"],
+ tools: ["gen_sdkinfo"],
cmd: "$(location) -v 45 -o $(out)",
}
@@ -55,7 +55,7 @@
installable: false,
visibility: [
":__pkg__",
- "//frameworks/av/apex/testing"
+ "//frameworks/av/apex/testing",
],
}
@@ -86,7 +86,6 @@
],
}
-
dex_import {
name: "test_framework-sdkextensions",
jars: ["test_framework-sdkextensions.jar"],
diff --git a/tests/cts/Classpaths/Android.bp b/tests/cts/Classpaths/Android.bp
index e572c08..60d31ef 100644
--- a/tests/cts/Classpaths/Android.bp
+++ b/tests/cts/Classpaths/Android.bp
@@ -21,7 +21,7 @@
java_test_host {
name: "CtsClasspathsTestCases",
defaults: ["cts_defaults"],
- srcs: [ "src/**/*.java" ],
+ srcs: ["src/**/*.java"],
libs: [
"cts-tradefed",
"tradefed",
diff --git a/tests/cts/Extensions/Android.bp b/tests/cts/Extensions/Android.bp
index 2bd6adc..b1f96c5 100644
--- a/tests/cts/Extensions/Android.bp
+++ b/tests/cts/Extensions/Android.bp
@@ -24,7 +24,7 @@
"ctstestrunner-axt",
"modules-utils-build",
],
- srcs: [ "src/**/*.java" ],
+ srcs: ["src/**/*.java"],
test_config: "CtsSdkExtensionsTestCases.xml",
test_suites: [
"cts",
diff --git a/tests/e2e/Android.bp b/tests/e2e/Android.bp
index c34f316..1a0b6f8 100644
--- a/tests/e2e/Android.bp
+++ b/tests/e2e/Android.bp
@@ -18,7 +18,7 @@
java_test_host {
name: "sdkextensions_e2e_tests",
- srcs: ["test-src/**/*.java"],
+ srcs: ["test-src/**/*.java"],
libs: ["tradefed"],
static_libs: [
"cts-install-lib-host",