ART: Run bpfmt over ART's blueprint files

Test: mmma art
Change-Id: Ic85df4770c12ec02836c877b243d4aec234aaada

20 files changed, 222 insertions, 196 deletions

diff --git a/build/Android.bp b/build/Android.bp
index 7b807d56b7..5b6de6115a 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -23,7 +23,7 @@ art_clang_tidy_errors = [
     "android-cloexec-open",
     "bugprone-argument-comment",
     "bugprone-lambda-function-name",
-    "bugprone-unused-raii",  // Protect scoped things like MutexLock.
+    "bugprone-unused-raii", // Protect scoped things like MutexLock.
     "bugprone-unused-return-value",
     "bugprone-virtual-near-miss",
     "modernize-use-bool-literals",
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 82c839271a..a0f8d8728c 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -123,7 +123,7 @@ art_tools_host_only_binaries = [
 
 // Libraries needed to use com.android.runtime.host for zipapex run-tests
 art_runtime_host_run_test_libs = [
-    "libartd-disassembler"
+    "libartd-disassembler",
 ]
 
 // Core Java libraries.
@@ -204,22 +204,22 @@ apex_defaults {
     compile_multilib: "both",
     manifest: "manifest.json",
     java_libs: libcore_java_libs,
-    native_shared_libs: art_runtime_base_native_shared_libs
-        + bionic_native_shared_libs
-        + libcore_native_device_only_shared_libs
-        + libcore_native_shared_libs,
+    native_shared_libs: art_runtime_base_native_shared_libs +
+        bionic_native_shared_libs +
+        libcore_native_device_only_shared_libs +
+        libcore_native_shared_libs,
     multilib: {
         both: {
-            binaries: art_runtime_base_binaries_both
-                + bionic_binaries_both,
+            binaries: art_runtime_base_binaries_both +
+                bionic_binaries_both,
         },
         prefer32: {
             binaries: art_runtime_base_binaries_prefer32,
         },
         first: {
-            binaries: art_tools_common_binaries
-                + art_tools_device_only_binaries,
-        }
+            binaries: art_tools_common_binaries +
+                art_tools_device_only_binaries,
+        },
     },
     binaries: [
         "art_postinstall_hook",
@@ -228,8 +228,8 @@ apex_defaults {
         "art_preinstall_hook_system_server",
         "art_prepostinstall_utils",
     ],
-    prebuilts: art_runtime_data_file_prebuilts
-        + ["com.android.runtime.ld.config.txt"],
+    prebuilts: art_runtime_data_file_prebuilts +
+        ["com.android.runtime.ld.config.txt"],
     key: "com.android.runtime.key",
     required: ["art_apex_boot_integrity"],
 }
@@ -250,18 +250,18 @@ apex {
 apex {
     name: "com.android.runtime.debug",
     defaults: ["com.android.runtime-defaults"],
-    native_shared_libs: art_runtime_debug_native_shared_libs
-        + libcore_debug_native_shared_libs
-        + bionic_native_shared_libs_device,
+    native_shared_libs: art_runtime_debug_native_shared_libs +
+        libcore_debug_native_shared_libs +
+        bionic_native_shared_libs_device,
     multilib: {
         prefer32: {
-            binaries: art_runtime_debug_binaries_prefer32
-                + art_runtime_debug_binaries_prefer32_device,
+            binaries: art_runtime_debug_binaries_prefer32 +
+                art_runtime_debug_binaries_prefer32_device,
         },
         first: {
-            binaries: art_tools_debug_binaries
-                + art_tools_debug_device_only_binaries,
-        }
+            binaries: art_tools_debug_binaries +
+                art_tools_debug_device_only_binaries,
+        },
     },
     certificate: ":com.android.runtime.debug.certificate",
 }
@@ -280,24 +280,24 @@ art_apex_test {
     manifest: "manifest.json",
     java_libs: libcore_java_libs,
     ignore_system_library_special_case: true,
-    native_shared_libs: art_runtime_base_native_shared_libs
-        + art_runtime_debug_native_shared_libs
-        + libcore_native_shared_libs
-        + libcore_debug_native_shared_libs
-        + art_runtime_libraries_zipapex
-        + art_runtime_host_run_test_libs,
+    native_shared_libs: art_runtime_base_native_shared_libs +
+        art_runtime_debug_native_shared_libs +
+        libcore_native_shared_libs +
+        libcore_debug_native_shared_libs +
+        art_runtime_libraries_zipapex +
+        art_runtime_host_run_test_libs,
     multilib: {
         both: {
-            binaries: art_runtime_base_binaries_both
-                + art_runtime_debug_binaries_both_host,
+            binaries: art_runtime_base_binaries_both +
+                art_runtime_debug_binaries_both_host,
         },
         first: {
-            binaries: art_tools_common_binaries
-                + art_tools_debug_binaries  // Host APEX is always debug.
-                + art_tools_host_only_binaries
-                + art_runtime_base_binaries_prefer32
-                + art_runtime_debug_binaries_prefer32,
-        }
+            binaries: art_tools_common_binaries + // Host APEX is always debug.
+                art_tools_debug_binaries +
+                art_tools_host_only_binaries +
+                art_runtime_base_binaries_prefer32 +
+                art_runtime_debug_binaries_prefer32,
+        },
     },
     key: "com.android.runtime.key",
     target: {
@@ -310,8 +310,8 @@ art_apex_test {
                 both: {
                     native_shared_libs: bionic_native_shared_libs,
                     binaries: bionic_binaries_both,
-                }
-            }
+                },
+            },
         },
     },
 }
@@ -339,13 +339,14 @@ genrule {
         "art-apex-tester",
         "debugfs",
     ],
-    cmd: "$(location art-apex-tester)"
-              + " --debugfs $(location debugfs)"
-              + " --tmpdir $(genDir)"
-              + " $(in)"
-         + " && touch $(out)",
+    cmd: "$(location art-apex-tester)" +
+        " --debugfs $(location debugfs)" +
+        " --tmpdir $(genDir)" +
+        " $(in)" +
+        " && touch $(out)",
     out: ["art-check-release-apex-gen.dummy"],
 }
+
 cc_prebuilt_binary {
     name: "art-check-release-apex-gen-fakebin",
     srcs: [":art-check-release-apex-gen"],
@@ -353,7 +354,7 @@ cc_prebuilt_binary {
     device_supported: false,
     target: {
         darwin: {
-            enabled: false,  // No python3.
+            enabled: false, // No python3.
         },
     },
 }
@@ -365,14 +366,15 @@ genrule {
         "art-apex-tester",
         "debugfs",
     ],
-    cmd: "$(location art-apex-tester)"
-              + " --debugfs $(location debugfs)"
-              + " --tmpdir $(genDir)"
-              + " --debug"
-              + " $(in)"
-         + " && touch $(out)",
+    cmd: "$(location art-apex-tester)" +
+        " --debugfs $(location debugfs)" +
+        " --tmpdir $(genDir)" +
+        " --debug" +
+        " $(in)" +
+        " && touch $(out)",
     out: ["art-check-debug-apex-gen.dummy"],
 }
+
 cc_prebuilt_binary {
     name: "art-check-debug-apex-gen-fakebin",
     srcs: [":art-check-debug-apex-gen"],
@@ -380,7 +382,7 @@ cc_prebuilt_binary {
     device_supported: false,
     target: {
         darwin: {
-            enabled: false,  // No python3.
+            enabled: false, // No python3.
         },
     },
 }
@@ -391,18 +393,22 @@ sh_binary {
     name: "art_preinstall_hook",
     src: "art_preinstall_hook.sh",
 }
+
 sh_binary {
     name: "art_preinstall_hook_boot",
     src: "art_preinstall_hook_boot.sh",
 }
+
 sh_binary {
     name: "art_preinstall_hook_system_server",
     src: "art_preinstall_hook_system_server.sh",
 }
+
 sh_binary {
     name: "art_prepostinstall_utils",
     src: "art_prepostinstall_utils.sh",
 }
+
 sh_binary {
     name: "art_postinstall_hook",
     src: "art_postinstall_hook.sh",
diff --git a/compiler/Android.bp b/compiler/Android.bp
index 31980691ee..aee181aec2 100644
--- a/compiler/Android.bp
+++ b/compiler/Android.bp
@@ -177,7 +177,7 @@ art_cc_defaults {
     ],
     include_dirs: ["art/disassembler"],
     header_libs: [
-        "art_cmdlineparser_headers",  // For compiler_options.
+        "art_cmdlineparser_headers", // For compiler_options.
         "libnativehelper_header_only",
     ],
 
@@ -254,7 +254,7 @@ art_cc_library {
     target: {
         android: {
             lto: {
-                 thin: true,
+                thin: true,
             },
         },
     },
diff --git a/dex2oat/Android.bp b/dex2oat/Android.bp
index d4b2ae6d75..74df162d4b 100644
--- a/dex2oat/Android.bp
+++ b/dex2oat/Android.bp
@@ -266,7 +266,7 @@ art_cc_binary {
     target: {
         android: {
             lto: {
-                 thin: true,
+                thin: true,
             },
             static_libs: [
                 "libz",
diff --git a/dexdump/Android.bp b/dexdump/Android.bp
index c8b2ce5595..f46b4dea3e 100644
--- a/dexdump/Android.bp
+++ b/dexdump/Android.bp
@@ -51,7 +51,7 @@ art_cc_binary {
         darwin: {
             enabled: true,
         },
-    }
+    },
 }
 
 art_cc_test {
diff --git a/dexlayout/Android.bp b/dexlayout/Android.bp
index 7313405d7b..65bb92cdd8 100644
--- a/dexlayout/Android.bp
+++ b/dexlayout/Android.bp
@@ -67,7 +67,7 @@ art_cc_library {
     target: {
         android: {
             lto: {
-                 thin: true,
+                thin: true,
             },
             shared_libs: [
                 "libartbase",
@@ -110,8 +110,8 @@ cc_defaults {
 art_cc_library {
     name: "libartd-dexlayout",
     defaults: [
-      "libart-dexlayout-defaults",
-      "art_debug_defaults",
+        "libart-dexlayout-defaults",
+        "art_debug_defaults",
     ],
     target: {
         android: {
diff --git a/dexlist/Android.bp b/dexlist/Android.bp
index 356791c8b2..e1d53a2eb4 100644
--- a/dexlist/Android.bp
+++ b/dexlist/Android.bp
@@ -20,7 +20,7 @@ art_cc_binary {
     shared_libs: [
         "libdexfile",
         "libartbase",
-        "libbase"
+        "libbase",
     ],
 }
 
diff --git a/disassembler/Android.bp b/disassembler/Android.bp
index 5aa159e98b..d7fd39b0be 100644
--- a/disassembler/Android.bp
+++ b/disassembler/Android.bp
@@ -25,10 +25,10 @@ art_cc_defaults {
     ],
     codegen: {
         arm: {
-            srcs: ["disassembler_arm.cc"]
+            srcs: ["disassembler_arm.cc"],
         },
         arm64: {
-            srcs: ["disassembler_arm64.cc"]
+            srcs: ["disassembler_arm64.cc"],
         },
         // TODO: We should also conditionally include the MIPS32/MIPS64 and the
         // x86/x86-64 disassembler definitions (b/119090273). However, using the
diff --git a/dt_fd_forward/Android.bp b/dt_fd_forward/Android.bp
index 2a2aa188bb..da4ebe50d7 100644
--- a/dt_fd_forward/Android.bp
+++ b/dt_fd_forward/Android.bp
@@ -41,7 +41,7 @@ cc_defaults {
     header_libs: [
         "javavm_headers",
         "dt_fd_forward_export",
-        "art_libartbase_headers",  // For strlcpy emulation.
+        "art_libartbase_headers", // For strlcpy emulation.
     ],
     multilib: {
         lib32: {
diff --git a/dt_fd_forward/export/Android.bp b/dt_fd_forward/export/Android.bp
index c3a63212b9..c0c16fcf9e 100644
--- a/dt_fd_forward/export/Android.bp
+++ b/dt_fd_forward/export/Android.bp
@@ -16,7 +16,7 @@
 
 cc_library_headers {
     name: "dt_fd_forward_export",
-    export_include_dirs: [ "." ],
+    export_include_dirs: ["."],
     host_supported: true,
     device_supported: true,
 }
diff --git a/libartbase/Android.bp b/libartbase/Android.bp
index 06a8476767..bbb84a69a0 100644
--- a/libartbase/Android.bp
+++ b/libartbase/Android.bp
@@ -108,7 +108,7 @@ cc_defaults {
             cflags: ["-Wno-thread-safety"],
         },
         darwin: {
-            enabled: true,  // for libdexfile.
+            enabled: true, // for libdexfile.
         },
     },
     generated_sources: ["art_libartbase_operator_srcs"],
diff --git a/libartpalette/Android.bp b/libartpalette/Android.bp
index 5a3e986898..0a45b8880b 100644
--- a/libartpalette/Android.bp
+++ b/libartpalette/Android.bp
@@ -15,10 +15,10 @@
 //
 
 cc_defaults {
-  name: "libartpalette_defaults",
-  defaults: ["art_defaults"],
-  host_supported: true,
-  export_include_dirs: ["include"],
+    name: "libartpalette_defaults",
+    defaults: ["art_defaults"],
+    host_supported: true,
+    export_include_dirs: ["include"],
 }
 
 // libartpalette-system is the implementation of the abstraction layer. It is
@@ -29,20 +29,20 @@ art_cc_library {
     compile_multilib: "both",
     target: {
         android: {
-          srcs: ["system/palette_android.cc",],
-          header_libs: ["libbase_headers"],
-          shared_libs: [
-            "libbase",
-            "libcutils",
-            "liblog",
-            "libprocessgroup",
-            "libtombstoned_client",
-          ],
+            srcs: ["system/palette_android.cc"],
+            header_libs: ["libbase_headers"],
+            shared_libs: [
+                "libbase",
+                "libcutils",
+                "liblog",
+                "libprocessgroup",
+                "libtombstoned_client",
+            ],
         },
         host: {
-          header_libs: ["libbase_headers"],
-          srcs: ["system/palette_fake.cc",],
-          shared_libs: ["libbase"],
+            header_libs: ["libbase_headers"],
+            srcs: ["system/palette_fake.cc"],
+            shared_libs: ["libbase"],
         },
         darwin: {
             enabled: false,
@@ -63,7 +63,7 @@ art_cc_library {
 art_cc_library {
     name: "libartpalette",
     defaults: ["libartpalette_defaults"],
-    required: ["libartpalette-system"],  // libartpalette.so dlopen()'s libartpalette-system.
+    required: ["libartpalette-system"], // libartpalette.so dlopen()'s libartpalette-system.
     header_libs: ["libbase_headers"],
     target: {
         // Targets supporting dlopen build the client library which loads
@@ -79,24 +79,24 @@ art_cc_library {
             version_script: "libartpalette.map.txt",
         },
         linux_bionic: {
-          header_libs: ["libbase_headers"],
+            header_libs: ["libbase_headers"],
             srcs: ["system/palette_fake.cc"],
             shared: {
-              shared_libs: [
-                "libbase",
-                "liblog"
-              ],
+                shared_libs: [
+                    "libbase",
+                    "liblog",
+                ],
             },
             version_script: "libartpalette.map.txt",
         },
         linux_glibc: {
-          header_libs: ["libbase_headers"],
+            header_libs: ["libbase_headers"],
             srcs: ["system/palette_fake.cc"],
             shared: {
-              shared_libs: [
-                "libbase",
-                "liblog"
-              ],
+                shared_libs: [
+                    "libbase",
+                    "liblog",
+                ],
             },
             version_script: "libartpalette.map.txt",
         },
@@ -107,8 +107,8 @@ art_cc_library {
             header_libs: ["libbase_headers"],
             srcs: ["system/palette_fake.cc"],
             static_libs: [
-              "libbase",
-              "liblog"
+                "libbase",
+                "liblog",
             ],
         },
         windows: {
@@ -116,11 +116,11 @@ art_cc_library {
             header_libs: ["libbase_headers"],
             srcs: ["system/palette_fake.cc"],
             static_libs: [
-              "libbase",
-              "liblog"
+                "libbase",
+                "liblog",
             ],
         },
-    }
+    },
 }
 
 art_cc_test {
diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp
index 2c4c3d855c..c417d5fe74 100644
--- a/libdexfile/Android.bp
+++ b/libdexfile/Android.bp
@@ -45,11 +45,11 @@ cc_defaults {
                 "libz",
             ],
             shared_libs: [
-                 // For MemMap.
-                 "libartpalette",
-                 "liblog",
-                 // For common macros.
-                 "libbase",
+                // For MemMap.
+                "libartpalette",
+                "liblog",
+                // For common macros.
+                "libbase",
             ],
             export_shared_lib_headers: [
                 "libbase",
@@ -59,11 +59,11 @@ cc_defaults {
             shared_libs: [
                 "libziparchive",
                 "libz",
-                 // For MemMap.
-                 "libartpalette",
-                 "liblog",
-                 // For common macros.
-                 "libbase",
+                // For MemMap.
+                "libartpalette",
+                "liblog",
+                // For common macros.
+                "libbase",
             ],
             export_shared_lib_headers: [
                 "libbase",
@@ -73,11 +73,11 @@ cc_defaults {
             static_libs: [
                 "libziparchive",
                 "libz",
-                 // For MemMap.
-                 "libartpalette",
-                 "liblog",
-                 // For common macros.
-                 "libbase",
+                // For MemMap.
+                "libartpalette",
+                "liblog",
+                // For common macros.
+                "libbase",
             ],
             export_static_lib_headers: [
                 "libbase",
@@ -146,7 +146,7 @@ art_cc_library {
     target: {
         android: {
             shared_libs: [
-                 "libartbase",
+                "libartbase",
             ],
             export_shared_lib_headers: [
                 "libartbase",
@@ -154,7 +154,7 @@ art_cc_library {
         },
         not_windows: {
             shared_libs: [
-                 "libartbase",
+                "libartbase",
             ],
             export_shared_lib_headers: [
                 "libartbase",
@@ -166,7 +166,7 @@ art_cc_library {
                 enabled: false,
             },
             static_libs: [
-                 "libartbase",
+                "libartbase",
             ],
             export_static_lib_headers: [
                 "libartbase",
@@ -184,7 +184,7 @@ art_cc_library {
     target: {
         android: {
             shared_libs: [
-                 "libartbased",
+                "libartbased",
             ],
             export_shared_lib_headers: [
                 "libartbased",
@@ -192,7 +192,7 @@ art_cc_library {
         },
         not_windows: {
             shared_libs: [
-                 "libartbased",
+                "libartbased",
             ],
             export_shared_lib_headers: [
                 "libartbased",
@@ -204,7 +204,7 @@ art_cc_library {
                 enabled: false,
             },
             static_libs: [
-                 "libartbased",
+                "libartbased",
             ],
             export_static_lib_headers: [
                 "libartbased",
@@ -307,7 +307,7 @@ cc_library {
 art_cc_test {
     name: "art_libdexfile_external_tests",
     host_supported: true,
-    test_per_src: true,  // For consistency with other ART gtests.
+    test_per_src: true, // For consistency with other ART gtests.
     srcs: [
         "external/dex_file_ext_c_test.c",
     ],
diff --git a/profman/Android.bp b/profman/Android.bp
index bcefffd4d2..099d555f26 100644
--- a/profman/Android.bp
+++ b/profman/Android.bp
@@ -78,7 +78,7 @@ art_cc_binary {
         },
         windows: {
             enabled: true,
-	    cflags: ["-Wno-thread-safety"],
+            cflags: ["-Wno-thread-safety"],
         },
     },
 }
diff --git a/runtime/Android.bp b/runtime/Android.bp
index 2325b0d288..8c81f81b43 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -20,7 +20,7 @@
 // (empty) body is called.
 JIT_DEBUG_REGISTER_CODE_LDFLAGS = [
     "-Wl,--keep-unique,__jit_debug_register_code",
-    "-Wl,--keep-unique,__dex_debug_register_code"
+    "-Wl,--keep-unique,__dex_debug_register_code",
 ]
 
 libart_cc_defaults {
@@ -346,7 +346,7 @@ libart_cc_defaults {
                 "libdl_android",
             ],
             static_libs: [
-                "libz",  // For adler32.
+                "libz", // For adler32.
             ],
             cflags: [
                 // ART is allowed to link to libicuuc directly
@@ -373,7 +373,7 @@ libart_cc_defaults {
                 "thread_linux.cc",
             ],
             shared_libs: [
-                "libz",  // For adler32.
+                "libz", // For adler32.
             ],
         },
     },
@@ -422,8 +422,8 @@ libart_static_cc_defaults {
         "libartpalette",
         "libbacktrace",
         "libbase",
-        "libdexfile_external",  // libunwindstack dependency
-        "libdexfile_support",  // libunwindstack dependency
+        "libdexfile_external", // libunwindstack dependency
+        "libdexfile_support", // libunwindstack dependency
         "liblog",
         "libnativebridge",
         "libnativeloader",
@@ -530,7 +530,7 @@ art_cc_library {
     target: {
         android: {
             lto: {
-                 thin: true,
+                thin: true,
             },
         },
     },
@@ -688,49 +688,67 @@ cc_library_headers {
 }
 
 genrule {
-  name: "libart_mterp.arm",
-  out: ["mterp_arm.S"],
-  srcs: ["interpreter/mterp/arm/*.S"],
-  tool_files: ["interpreter/mterp/gen_mterp.py", "interpreter/mterp/common/gen_setup.py"],
-  cmd: "$(location interpreter/mterp/gen_mterp.py) $(out) $(in)",
+    name: "libart_mterp.arm",
+    out: ["mterp_arm.S"],
+    srcs: ["interpreter/mterp/arm/*.S"],
+    tool_files: [
+        "interpreter/mterp/gen_mterp.py",
+        "interpreter/mterp/common/gen_setup.py",
+    ],
+    cmd: "$(location interpreter/mterp/gen_mterp.py) $(out) $(in)",
 }
 
 genrule {
-  name: "libart_mterp.arm64",
-  out: ["mterp_arm64.S"],
-  srcs: ["interpreter/mterp/arm64/*.S"],
-  tool_files: ["interpreter/mterp/gen_mterp.py", "interpreter/mterp/common/gen_setup.py"],
-  cmd: "$(location interpreter/mterp/gen_mterp.py) $(out) $(in)",
+    name: "libart_mterp.arm64",
+    out: ["mterp_arm64.S"],
+    srcs: ["interpreter/mterp/arm64/*.S"],
+    tool_files: [
+        "interpreter/mterp/gen_mterp.py",
+        "interpreter/mterp/common/gen_setup.py",
+    ],
+    cmd: "$(location interpreter/mterp/gen_mterp.py) $(out) $(in)",
 }
 
 genrule {
-  name: "libart_mterp.mips",
-  out: ["mterp_mips.S"],
-  srcs: ["interpreter/mterp/mips/*.S"],
-  tool_files: ["interpreter/mterp/gen_mterp.py", "interpreter/mterp/common/gen_setup.py"],
-  cmd: "$(location interpreter/mterp/gen_mterp.py) $(out) $(in)",
+    name: "libart_mterp.mips",
+    out: ["mterp_mips.S"],
+    srcs: ["interpreter/mterp/mips/*.S"],
+    tool_files: [
+        "interpreter/mterp/gen_mterp.py",
+        "interpreter/mterp/common/gen_setup.py",
+    ],
+    cmd: "$(location interpreter/mterp/gen_mterp.py) $(out) $(in)",
 }
 
 genrule {
-  name: "libart_mterp.mips64",
-  out: ["mterp_mips64.S"],
-  srcs: ["interpreter/mterp/mips64/*.S"],
-  tool_files: ["interpreter/mterp/gen_mterp.py", "interpreter/mterp/common/gen_setup.py"],
-  cmd: "$(location interpreter/mterp/gen_mterp.py) $(out) $(in)",
+    name: "libart_mterp.mips64",
+    out: ["mterp_mips64.S"],
+    srcs: ["interpreter/mterp/mips64/*.S"],
+    tool_files: [
+        "interpreter/mterp/gen_mterp.py",
+        "interpreter/mterp/common/gen_setup.py",
+    ],
+    cmd: "$(location interpreter/mterp/gen_mterp.py) $(out) $(in)",
 }
 
 genrule {
-  name: "libart_mterp.x86",
-  out: ["mterp_x86.S"],
-  srcs: ["interpreter/mterp/x86/*.S"],
-  tool_files: ["interpreter/mterp/gen_mterp.py", "interpreter/mterp/common/gen_setup.py"],
-  cmd: "$(location interpreter/mterp/gen_mterp.py) $(out) $(in)",
+    name: "libart_mterp.x86",
+    out: ["mterp_x86.S"],
+    srcs: ["interpreter/mterp/x86/*.S"],
+    tool_files: [
+        "interpreter/mterp/gen_mterp.py",
+        "interpreter/mterp/common/gen_setup.py",
+    ],
+    cmd: "$(location interpreter/mterp/gen_mterp.py) $(out) $(in)",
 }
 
 genrule {
-  name: "libart_mterp.x86_64",
-  out: ["mterp_x86_64.S"],
-  srcs: ["interpreter/mterp/x86_64/*.S"],
-  tool_files: ["interpreter/mterp/gen_mterp.py", "interpreter/mterp/common/gen_setup.py"],
-  cmd: "$(location interpreter/mterp/gen_mterp.py) $(out) $(in)",
+    name: "libart_mterp.x86_64",
+    out: ["mterp_x86_64.S"],
+    srcs: ["interpreter/mterp/x86_64/*.S"],
+    tool_files: [
+        "interpreter/mterp/gen_mterp.py",
+        "interpreter/mterp/common/gen_setup.py",
+    ],
+    cmd: "$(location interpreter/mterp/gen_mterp.py) $(out) $(in)",
 }
diff --git a/test/Android.bp b/test/Android.bp
index 7f25a6a02c..263c615c0d 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -374,7 +374,7 @@ cc_library_static {
         "libbase_ndk",
     ],
     shared_libs: [
-        "libz",  // for slicer (using adler32).
+        "libz", // for slicer (using adler32).
     ],
     sdk_version: "current",
     stl: "c++_static",
diff --git a/tools/Android.bp b/tools/Android.bp
index a7ed9bc0b0..a3614c40b0 100644
--- a/tools/Android.bp
+++ b/tools/Android.bp
@@ -15,16 +15,16 @@
 //
 
 python_binary_host {
-  name: "generate_operator_out",
-  srcs: [
-    "generate_operator_out.py",
-  ],
-  version: {
-    py2: {
-      enabled: true,
+    name: "generate_operator_out",
+    srcs: [
+        "generate_operator_out.py",
+    ],
+    version: {
+        py2: {
+            enabled: true,
+        },
+        py3: {
+            enabled: false,
+        },
     },
-    py3: {
-      enabled: false,
-    },
-  },
 }
diff --git a/tools/class2greylist/Android.bp b/tools/class2greylist/Android.bp
index 1e3cdff59c..371419e953 100644
--- a/tools/class2greylist/Android.bp
+++ b/tools/class2greylist/Android.bp
@@ -15,20 +15,19 @@
 //
 
 java_library_host {
-  name: "class2greylistlib",
-  srcs: ["src/**/*.java"],
-  static_libs: [
-    "commons-cli-1.2",
-    "apache-bcel",
-    "guava",
-  ],
+    name: "class2greylistlib",
+    srcs: ["src/**/*.java"],
+    static_libs: [
+        "commons-cli-1.2",
+        "apache-bcel",
+        "guava",
+    ],
 }
 
 java_binary_host {
-  name: "class2greylist",
-  manifest: "src/class2greylist.mf",
-  static_libs: [
-    "class2greylistlib",
-  ],
+    name: "class2greylist",
+    manifest: "src/class2greylist.mf",
+    static_libs: [
+        "class2greylistlib",
+    ],
 }
-
diff --git a/tools/jvmti-agents/simple-force-redefine/Android.bp b/tools/jvmti-agents/simple-force-redefine/Android.bp
index 871f210ac9..2a739bed93 100644
--- a/tools/jvmti-agents/simple-force-redefine/Android.bp
+++ b/tools/jvmti-agents/simple-force-redefine/Android.bp
@@ -26,8 +26,8 @@ cc_defaults {
     compile_multilib: "both",
 
     shared_libs: [
-      "libz",
-      "liblog",
+        "libz",
+        "liblog",
     ],
     header_libs: [
         "libopenjdkjvmti_headers",
@@ -43,20 +43,20 @@ cc_defaults {
     sdk_version: "current",
     stl: "libc++_static",
     target: {
-      android: {
-        static_libs: [
-          "slicer_ndk_no_rtti",
-          "libbase_ndk",
-        ],
-      },
-      host: {
-        static_libs: [
-          "slicer_no_rtti",
-        ],
-        shared_libs: [
-          "libbase",
-        ],
-      },
+        android: {
+            static_libs: [
+                "slicer_ndk_no_rtti",
+                "libbase_ndk",
+            ],
+        },
+        host: {
+            static_libs: [
+                "slicer_no_rtti",
+            ],
+            shared_libs: [
+                "libbase",
+            ],
+        },
     },
     multilib: {
         lib32: {
diff --git a/tools/veridex/Android.bp b/tools/veridex/Android.bp
index e309607eea..d6f30ad887 100644
--- a/tools/veridex/Android.bp
+++ b/tools/veridex/Android.bp
@@ -24,7 +24,10 @@ cc_binary {
         "resolver.cc",
         "veridex.cc",
     ],
-    cflags: ["-Wall", "-Werror"],
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
     static_libs: [
         "libdexfile",
         "libartbase",