Fix bpfmt issues and add bpfmt to preupload checks
Test: m nothing
Change-Id: I10526a33685335bdd26cc7692815133379d4e0f6
diff --git a/Android.bp b/Android.bp
index 0b44198..3075d67 100644
--- a/Android.bp
+++ b/Android.bp
@@ -106,15 +106,24 @@
},
arm64: {
src: "prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/lib/gcc/aarch64-linux-android/4.9.x/libgcc.a",
- repack_objects_to_keep: ["unwind-dw2.o", "unwind-dw2-fde-dip.o"],
+ repack_objects_to_keep: [
+ "unwind-dw2.o",
+ "unwind-dw2-fde-dip.o",
+ ],
},
x86: {
src: "prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/lib/gcc/x86_64-linux-android/4.9.x/32/libgcc.a",
- repack_objects_to_keep: ["unwind-dw2.o", "unwind-dw2-fde-dip.o"],
+ repack_objects_to_keep: [
+ "unwind-dw2.o",
+ "unwind-dw2-fde-dip.o",
+ ],
},
x86_64: {
src: "prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/lib/gcc/x86_64-linux-android/4.9.x/libgcc.a",
- repack_objects_to_keep: ["unwind-dw2.o", "unwind-dw2-fde-dip.o"],
+ repack_objects_to_keep: [
+ "unwind-dw2.o",
+ "unwind-dw2-fde-dip.o",
+ ],
},
},
}
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index 928ca03..ff85661 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -1,2 +1,3 @@
[Builtin Hooks]
gofmt = true
+bpfmt = true
diff --git a/bpfix/Android.bp b/bpfix/Android.bp
index e291578..b244e3a 100644
--- a/bpfix/Android.bp
+++ b/bpfix/Android.bp
@@ -44,11 +44,9 @@
"bpfix/bpfix.go",
],
testSrcs: [
- "bpfix/bpfix_test.go",
+ "bpfix/bpfix_test.go",
],
deps: [
"blueprint-parser",
],
}
-
-
diff --git a/cmd/extract_apks/Android.bp b/cmd/extract_apks/Android.bp
index 90548cd..f8fe864 100644
--- a/cmd/extract_apks/Android.bp
+++ b/cmd/extract_apks/Android.bp
@@ -6,7 +6,7 @@
"golang-protobuf-proto",
"soong-cmd-extract_apks-proto",
],
- testSrcs: ["main_test.go"]
+ testSrcs: ["main_test.go"],
}
bootstrap_go_package {
diff --git a/cmd/extract_jar_packages/Android.bp b/cmd/extract_jar_packages/Android.bp
index ea0cbbf..4ea8798 100644
--- a/cmd/extract_jar_packages/Android.bp
+++ b/cmd/extract_jar_packages/Android.bp
@@ -22,4 +22,3 @@
"extract_jar_packages.go",
],
}
-
diff --git a/cmd/extract_linker/Android.bp b/cmd/extract_linker/Android.bp
index fe76ae4..690c4fa 100644
--- a/cmd/extract_linker/Android.bp
+++ b/cmd/extract_linker/Android.bp
@@ -17,4 +17,3 @@
srcs: ["main.go"],
testSrcs: ["main_test.go"],
}
-
diff --git a/cmd/merge_zips/Android.bp b/cmd/merge_zips/Android.bp
index f70c86e..8c97b6d 100644
--- a/cmd/merge_zips/Android.bp
+++ b/cmd/merge_zips/Android.bp
@@ -15,10 +15,10 @@
blueprint_go_binary {
name: "merge_zips",
deps: [
- "android-archive-zip",
- "blueprint-pathtools",
- "soong-jar",
- "soong-zip",
+ "android-archive-zip",
+ "blueprint-pathtools",
+ "soong-jar",
+ "soong-zip",
],
srcs: [
"merge_zips.go",
@@ -27,4 +27,3 @@
"merge_zips_test.go",
],
}
-
diff --git a/cmd/sbox/Android.bp b/cmd/sbox/Android.bp
index a706810d..6fa304e 100644
--- a/cmd/sbox/Android.bp
+++ b/cmd/sbox/Android.bp
@@ -19,4 +19,3 @@
"sbox.go",
],
}
-
diff --git a/cmd/soong_build/Android.bp b/cmd/soong_build/Android.bp
index 6b79823..b559bac 100644
--- a/cmd/soong_build/Android.bp
+++ b/cmd/soong_build/Android.bp
@@ -29,4 +29,3 @@
],
primaryBuilder: true,
}
-
diff --git a/cmd/soong_env/Android.bp b/cmd/soong_env/Android.bp
index 4cdc396..4db0da3 100644
--- a/cmd/soong_env/Android.bp
+++ b/cmd/soong_env/Android.bp
@@ -22,4 +22,3 @@
],
default: true,
}
-
diff --git a/cmd/zip2zip/Android.bp b/cmd/zip2zip/Android.bp
index 68d8bc7..2c4cd82 100644
--- a/cmd/zip2zip/Android.bp
+++ b/cmd/zip2zip/Android.bp
@@ -24,4 +24,3 @@
],
testSrcs: ["zip2zip_test.go"],
}
-
diff --git a/cmd/zipsync/Android.bp b/cmd/zipsync/Android.bp
index 22feadc..49b5f3e 100644
--- a/cmd/zipsync/Android.bp
+++ b/cmd/zipsync/Android.bp
@@ -22,4 +22,3 @@
"zipsync.go",
],
}
-
diff --git a/dexpreopt/dexpreopt_gen/Android.bp b/dexpreopt/dexpreopt_gen/Android.bp
index 0790391..3f0619c 100644
--- a/dexpreopt/dexpreopt_gen/Android.bp
+++ b/dexpreopt/dexpreopt_gen/Android.bp
@@ -8,4 +8,4 @@
"blueprint-pathtools",
"blueprint-proptools",
],
-}
\ No newline at end of file
+}
diff --git a/finder/Android.bp b/finder/Android.bp
index 47b47c9..a5d7fd4 100644
--- a/finder/Android.bp
+++ b/finder/Android.bp
@@ -17,7 +17,7 @@
//
subdirs = [
- "cmd"
+ "cmd",
]
bootstrap_go_package {
@@ -30,8 +30,6 @@
"finder_test.go",
],
deps: [
- "soong-finder-fs",
+ "soong-finder-fs",
],
}
-
-
diff --git a/finder/cmd/Android.bp b/finder/cmd/Android.bp
index 9dc84ae..e066c39 100644
--- a/finder/cmd/Android.bp
+++ b/finder/cmd/Android.bp
@@ -22,8 +22,6 @@
"finder.go",
],
deps: [
- "soong-finder"
+ "soong-finder",
],
}
-
-
diff --git a/finder/fs/Android.bp b/finder/fs/Android.bp
index 27e3c7d..cf996ab 100644
--- a/finder/fs/Android.bp
+++ b/finder/fs/Android.bp
@@ -37,4 +37,3 @@
],
},
}
-
diff --git a/scripts/Android.bp b/scripts/Android.bp
index 1f55030..7f2ddb8 100644
--- a/scripts/Android.bp
+++ b/scripts/Android.bp
@@ -106,7 +106,7 @@
py3: {
enabled: false,
},
- }
+ },
}
python_binary_host {
diff --git a/zip/Android.bp b/zip/Android.bp
index 259e010..5081e91 100644
--- a/zip/Android.bp
+++ b/zip/Android.bp
@@ -27,7 +27,6 @@
"rate_limit.go",
],
testSrcs: [
- "zip_test.go",
+ "zip_test.go",
],
}
-