diff --git a/audio/2.0/Android.bp b/audio/2.0/Android.bp
index 1de1cb7a83..ea3ea847d5 100644
--- a/audio/2.0/Android.bp
+++ b/audio/2.0/Android.bp
@@ -181,7 +181,8 @@ genrule {
     name: "android.hardware.audio@2.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio@2.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.audio@2.0-adapter",
diff --git a/audio/effect/2.0/Android.bp b/audio/effect/2.0/Android.bp
index d1730e0eab..e9402965d3 100644
--- a/audio/effect/2.0/Android.bp
+++ b/audio/effect/2.0/Android.bp
@@ -244,7 +244,8 @@ genrule {
     name: "android.hardware.audio.effect@2.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.audio.effect@2.0-adapter",
diff --git a/automotive/evs/1.0/Android.bp b/automotive/evs/1.0/Android.bp
index 34aa12f99a..be58711de3 100644
--- a/automotive/evs/1.0/Android.bp
+++ b/automotive/evs/1.0/Android.bp
@@ -150,7 +150,8 @@ genrule {
     name: "android.hardware.automotive.evs@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.evs@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.automotive.evs@1.0-adapter",
diff --git a/automotive/vehicle/2.0/Android.bp b/automotive/vehicle/2.0/Android.bp
index 6ccaac76fc..ffc768e36e 100644
--- a/automotive/vehicle/2.0/Android.bp
+++ b/automotive/vehicle/2.0/Android.bp
@@ -132,7 +132,8 @@ genrule {
     name: "android.hardware.automotive.vehicle@2.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.automotive.vehicle@2.0-adapter",
diff --git a/biometrics/fingerprint/2.1/Android.bp b/biometrics/fingerprint/2.1/Android.bp
index c96bfae5b1..719f47d543 100644
--- a/biometrics/fingerprint/2.1/Android.bp
+++ b/biometrics/fingerprint/2.1/Android.bp
@@ -132,7 +132,8 @@ genrule {
     name: "android.hardware.biometrics.fingerprint@2.1-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.biometrics.fingerprint@2.1",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.biometrics.fingerprint@2.1-adapter",
diff --git a/bluetooth/1.0/Android.bp b/bluetooth/1.0/Android.bp
index 222f3e67e1..5637aa49af 100644
--- a/bluetooth/1.0/Android.bp
+++ b/bluetooth/1.0/Android.bp
@@ -132,7 +132,8 @@ genrule {
     name: "android.hardware.bluetooth@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.bluetooth@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.bluetooth@1.0-adapter",
diff --git a/boot/1.0/Android.bp b/boot/1.0/Android.bp
index 2f4dcc354c..ad9cfc748a 100644
--- a/boot/1.0/Android.bp
+++ b/boot/1.0/Android.bp
@@ -123,7 +123,8 @@ genrule {
     name: "android.hardware.boot@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.boot@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.boot@1.0-adapter",
diff --git a/broadcastradio/1.0/Android.bp b/broadcastradio/1.0/Android.bp
index a81db9303f..9b8c5b3b0b 100644
--- a/broadcastradio/1.0/Android.bp
+++ b/broadcastradio/1.0/Android.bp
@@ -150,7 +150,8 @@ genrule {
     name: "android.hardware.broadcastradio@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.broadcastradio@1.0-adapter",
diff --git a/broadcastradio/1.1/Android.bp b/broadcastradio/1.1/Android.bp
index 6626b52c08..2111c16545 100644
--- a/broadcastradio/1.1/Android.bp
+++ b/broadcastradio/1.1/Android.bp
@@ -156,7 +156,8 @@ genrule {
     name: "android.hardware.broadcastradio@1.1-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.1",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.broadcastradio@1.1-adapter",
diff --git a/camera/device/1.0/Android.bp b/camera/device/1.0/Android.bp
index e591c62c4d..dfc58c9cac 100644
--- a/camera/device/1.0/Android.bp
+++ b/camera/device/1.0/Android.bp
@@ -149,7 +149,8 @@ genrule {
     name: "android.hardware.camera.device@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.camera.device@1.0-adapter",
diff --git a/camera/device/3.2/Android.bp b/camera/device/3.2/Android.bp
index 8eaf7c1054..d770964a67 100644
--- a/camera/device/3.2/Android.bp
+++ b/camera/device/3.2/Android.bp
@@ -149,7 +149,8 @@ genrule {
     name: "android.hardware.camera.device@3.2-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.2",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.camera.device@3.2-adapter",
diff --git a/camera/provider/2.4/Android.bp b/camera/provider/2.4/Android.bp
index 93c9806f90..40f759438a 100644
--- a/camera/provider/2.4/Android.bp
+++ b/camera/provider/2.4/Android.bp
@@ -148,7 +148,8 @@ genrule {
     name: "android.hardware.camera.provider@2.4-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.provider@2.4",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.camera.provider@2.4-adapter",
diff --git a/configstore/1.0/Android.bp b/configstore/1.0/Android.bp
index d059aaedfc..bd11112e26 100644
--- a/configstore/1.0/Android.bp
+++ b/configstore/1.0/Android.bp
@@ -123,7 +123,8 @@ genrule {
     name: "android.hardware.configstore@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.configstore@1.0-adapter",
diff --git a/contexthub/1.0/Android.bp b/contexthub/1.0/Android.bp
index 9c49edafea..74e028ca2f 100644
--- a/contexthub/1.0/Android.bp
+++ b/contexthub/1.0/Android.bp
@@ -132,7 +132,8 @@ genrule {
     name: "android.hardware.contexthub@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.contexthub@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.contexthub@1.0-adapter",
diff --git a/drm/1.0/Android.bp b/drm/1.0/Android.bp
index 0e091db44b..c5f814c569 100644
--- a/drm/1.0/Android.bp
+++ b/drm/1.0/Android.bp
@@ -159,7 +159,8 @@ genrule {
     name: "android.hardware.drm@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.drm@1.0-adapter",
diff --git a/dumpstate/1.0/Android.bp b/dumpstate/1.0/Android.bp
index b27e999481..684ab3515c 100644
--- a/dumpstate/1.0/Android.bp
+++ b/dumpstate/1.0/Android.bp
@@ -119,7 +119,8 @@ genrule {
     name: "android.hardware.dumpstate@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.dumpstate@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.dumpstate@1.0-adapter",
diff --git a/gatekeeper/1.0/Android.bp b/gatekeeper/1.0/Android.bp
index 13cb79503e..b3cd75e0d5 100644
--- a/gatekeeper/1.0/Android.bp
+++ b/gatekeeper/1.0/Android.bp
@@ -123,7 +123,8 @@ genrule {
     name: "android.hardware.gatekeeper@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gatekeeper@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.gatekeeper@1.0-adapter",
diff --git a/gnss/1.0/Android.bp b/gnss/1.0/Android.bp
index ef57449721..f40e6e11c3 100644
--- a/gnss/1.0/Android.bp
+++ b/gnss/1.0/Android.bp
@@ -294,7 +294,8 @@ genrule {
     name: "android.hardware.gnss@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gnss@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.gnss@1.0-adapter",
diff --git a/graphics/allocator/2.0/Android.bp b/graphics/allocator/2.0/Android.bp
index 0ef6450f9c..c24da12a1c 100644
--- a/graphics/allocator/2.0/Android.bp
+++ b/graphics/allocator/2.0/Android.bp
@@ -130,7 +130,8 @@ genrule {
     name: "android.hardware.graphics.allocator@2.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.allocator@2.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.graphics.allocator@2.0-adapter",
diff --git a/graphics/bufferqueue/1.0/Android.bp b/graphics/bufferqueue/1.0/Android.bp
index 87640a8694..c96c3c3cc3 100644
--- a/graphics/bufferqueue/1.0/Android.bp
+++ b/graphics/bufferqueue/1.0/Android.bp
@@ -136,7 +136,8 @@ genrule {
     name: "android.hardware.graphics.bufferqueue@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.bufferqueue@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.graphics.bufferqueue@1.0-adapter",
diff --git a/graphics/composer/2.1/Android.bp b/graphics/composer/2.1/Android.bp
index 6bea650c0d..9080781f8b 100644
--- a/graphics/composer/2.1/Android.bp
+++ b/graphics/composer/2.1/Android.bp
@@ -145,7 +145,8 @@ genrule {
     name: "android.hardware.graphics.composer@2.1-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.composer@2.1",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.graphics.composer@2.1-adapter",
diff --git a/graphics/mapper/2.0/Android.bp b/graphics/mapper/2.0/Android.bp
index 4e33ed2de0..f8298409df 100644
--- a/graphics/mapper/2.0/Android.bp
+++ b/graphics/mapper/2.0/Android.bp
@@ -128,7 +128,8 @@ genrule {
     name: "android.hardware.graphics.mapper@2.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.mapper@2.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.graphics.mapper@2.0-adapter",
diff --git a/health/1.0/Android.bp b/health/1.0/Android.bp
index a998ea9fd5..1b5661c23b 100644
--- a/health/1.0/Android.bp
+++ b/health/1.0/Android.bp
@@ -123,7 +123,8 @@ genrule {
     name: "android.hardware.health@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.health@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.health@1.0-adapter",
diff --git a/ir/1.0/Android.bp b/ir/1.0/Android.bp
index d3230da48c..6ca7701da1 100644
--- a/ir/1.0/Android.bp
+++ b/ir/1.0/Android.bp
@@ -123,7 +123,8 @@ genrule {
     name: "android.hardware.ir@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.ir@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.ir@1.0-adapter",
diff --git a/keymaster/3.0/Android.bp b/keymaster/3.0/Android.bp
index 46c5447dac..9019739ae6 100644
--- a/keymaster/3.0/Android.bp
+++ b/keymaster/3.0/Android.bp
@@ -123,7 +123,8 @@ genrule {
     name: "android.hardware.keymaster@3.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.keymaster@3.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.keymaster@3.0-adapter",
diff --git a/light/2.0/Android.bp b/light/2.0/Android.bp
index d8d2302d99..3412fcc3e1 100644
--- a/light/2.0/Android.bp
+++ b/light/2.0/Android.bp
@@ -123,7 +123,8 @@ genrule {
     name: "android.hardware.light@2.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.light@2.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.light@2.0-adapter",
diff --git a/media/omx/1.0/Android.bp b/media/omx/1.0/Android.bp
index 671f17d926..378c18e1a7 100644
--- a/media/omx/1.0/Android.bp
+++ b/media/omx/1.0/Android.bp
@@ -182,7 +182,8 @@ genrule {
     name: "android.hardware.media.omx@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.media.omx@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.media.omx@1.0-adapter",
diff --git a/memtrack/1.0/Android.bp b/memtrack/1.0/Android.bp
index ef9f4e38c4..fc6aa9d3b7 100644
--- a/memtrack/1.0/Android.bp
+++ b/memtrack/1.0/Android.bp
@@ -123,7 +123,8 @@ genrule {
     name: "android.hardware.memtrack@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.memtrack@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.memtrack@1.0-adapter",
diff --git a/nfc/1.0/Android.bp b/nfc/1.0/Android.bp
index aeafb77348..ac02e44b3e 100644
--- a/nfc/1.0/Android.bp
+++ b/nfc/1.0/Android.bp
@@ -132,7 +132,8 @@ genrule {
     name: "android.hardware.nfc@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.nfc@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.nfc@1.0-adapter",
diff --git a/power/1.0/Android.bp b/power/1.0/Android.bp
index 5e43accb65..5cc4ae0e1d 100644
--- a/power/1.0/Android.bp
+++ b/power/1.0/Android.bp
@@ -123,7 +123,8 @@ genrule {
     name: "android.hardware.power@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.power@1.0-adapter",
diff --git a/radio/1.0/Android.bp b/radio/1.0/Android.bp
index a7a2be30af..4485e74bc7 100644
--- a/radio/1.0/Android.bp
+++ b/radio/1.0/Android.bp
@@ -159,7 +159,8 @@ genrule {
     name: "android.hardware.radio@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.radio@1.0-adapter",
diff --git a/radio/1.1/Android.bp b/radio/1.1/Android.bp
index fc03b53d8b..d89211b9cf 100644
--- a/radio/1.1/Android.bp
+++ b/radio/1.1/Android.bp
@@ -156,7 +156,8 @@ genrule {
     name: "android.hardware.radio@1.1-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.1",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.radio@1.1-adapter",
diff --git a/radio/deprecated/1.0/Android.bp b/radio/deprecated/1.0/Android.bp
index 948be69eca..82a7c8d17d 100644
--- a/radio/deprecated/1.0/Android.bp
+++ b/radio/deprecated/1.0/Android.bp
@@ -143,7 +143,8 @@ genrule {
     name: "android.hardware.radio.deprecated@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio.deprecated@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.radio.deprecated@1.0-adapter",
diff --git a/renderscript/1.0/Android.bp b/renderscript/1.0/Android.bp
index ba2d2c853e..c687ea9582 100644
--- a/renderscript/1.0/Android.bp
+++ b/renderscript/1.0/Android.bp
@@ -133,7 +133,8 @@ genrule {
     name: "android.hardware.renderscript@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.renderscript@1.0-adapter",
diff --git a/sensors/1.0/Android.bp b/sensors/1.0/Android.bp
index 6b67ebf547..8a91ee6d11 100644
--- a/sensors/1.0/Android.bp
+++ b/sensors/1.0/Android.bp
@@ -123,7 +123,8 @@ genrule {
     name: "android.hardware.sensors@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.sensors@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.sensors@1.0-adapter",
diff --git a/soundtrigger/2.0/Android.bp b/soundtrigger/2.0/Android.bp
index 2fb386adb9..173aa753ca 100644
--- a/soundtrigger/2.0/Android.bp
+++ b/soundtrigger/2.0/Android.bp
@@ -136,7 +136,8 @@ genrule {
     name: "android.hardware.soundtrigger@2.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.soundtrigger@2.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.soundtrigger@2.0-adapter",
diff --git a/tests/bar/1.0/Android.bp b/tests/bar/1.0/Android.bp
index 230267ce31..ce4b4fc968 100644
--- a/tests/bar/1.0/Android.bp
+++ b/tests/bar/1.0/Android.bp
@@ -162,7 +162,8 @@ genrule {
     name: "android.hardware.tests.bar@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.bar@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.tests.bar@1.0-adapter",
diff --git a/tests/baz/1.0/Android.bp b/tests/baz/1.0/Android.bp
index a0a4f60239..3a208a8b3e 100644
--- a/tests/baz/1.0/Android.bp
+++ b/tests/baz/1.0/Android.bp
@@ -147,7 +147,8 @@ genrule {
     name: "android.hardware.tests.baz@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.baz@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.tests.baz@1.0-adapter",
diff --git a/tests/expression/1.0/Android.bp b/tests/expression/1.0/Android.bp
index dc0e5a8234..a54538c104 100644
--- a/tests/expression/1.0/Android.bp
+++ b/tests/expression/1.0/Android.bp
@@ -125,7 +125,8 @@ genrule {
     name: "android.hardware.tests.expression@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.expression@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.tests.expression@1.0-adapter",
diff --git a/tests/extension/light/2.0/Android.bp b/tests/extension/light/2.0/Android.bp
index 3c1b5eca3c..52206306f8 100644
--- a/tests/extension/light/2.0/Android.bp
+++ b/tests/extension/light/2.0/Android.bp
@@ -126,7 +126,8 @@ genrule {
     name: "android.hardware.tests.extension.light@2.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.extension.light@2.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.tests.extension.light@2.0-adapter",
diff --git a/tests/foo/1.0/Android.bp b/tests/foo/1.0/Android.bp
index 0d2d14759e..acf4fddea6 100644
--- a/tests/foo/1.0/Android.bp
+++ b/tests/foo/1.0/Android.bp
@@ -156,7 +156,8 @@ genrule {
     name: "android.hardware.tests.foo@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.foo@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.tests.foo@1.0-adapter",
diff --git a/tests/hash/1.0/Android.bp b/tests/hash/1.0/Android.bp
index 96af83b95d..3f7205edc4 100644
--- a/tests/hash/1.0/Android.bp
+++ b/tests/hash/1.0/Android.bp
@@ -116,7 +116,8 @@ genrule {
     name: "android.hardware.tests.hash@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.hash@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.tests.hash@1.0-adapter",
diff --git a/tests/inheritance/1.0/Android.bp b/tests/inheritance/1.0/Android.bp
index 6c2e79e119..e693082934 100644
--- a/tests/inheritance/1.0/Android.bp
+++ b/tests/inheritance/1.0/Android.bp
@@ -143,7 +143,8 @@ genrule {
     name: "android.hardware.tests.inheritance@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.inheritance@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.tests.inheritance@1.0-adapter",
diff --git a/tests/libhwbinder/1.0/Android.bp b/tests/libhwbinder/1.0/Android.bp
index 5812fa3b57..0a84abb34e 100644
--- a/tests/libhwbinder/1.0/Android.bp
+++ b/tests/libhwbinder/1.0/Android.bp
@@ -125,7 +125,8 @@ genrule {
     name: "android.hardware.tests.libhwbinder@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.libhwbinder@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.tests.libhwbinder@1.0-adapter",
diff --git a/tests/memory/1.0/Android.bp b/tests/memory/1.0/Android.bp
index df7e47ae92..7a36c0e5c2 100644
--- a/tests/memory/1.0/Android.bp
+++ b/tests/memory/1.0/Android.bp
@@ -116,7 +116,8 @@ genrule {
     name: "android.hardware.tests.memory@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.memory@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.tests.memory@1.0-adapter",
diff --git a/tests/msgq/1.0/Android.bp b/tests/msgq/1.0/Android.bp
index 124ba3d039..0af5420a68 100644
--- a/tests/msgq/1.0/Android.bp
+++ b/tests/msgq/1.0/Android.bp
@@ -125,7 +125,8 @@ genrule {
     name: "android.hardware.tests.msgq@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.msgq@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.tests.msgq@1.0-adapter",
diff --git a/tests/multithread/1.0/Android.bp b/tests/multithread/1.0/Android.bp
index 28a0418e3b..df38695c25 100644
--- a/tests/multithread/1.0/Android.bp
+++ b/tests/multithread/1.0/Android.bp
@@ -116,7 +116,8 @@ genrule {
     name: "android.hardware.tests.multithread@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.multithread@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.tests.multithread@1.0-adapter",
diff --git a/tests/pointer/1.0/Android.bp b/tests/pointer/1.0/Android.bp
index a1297bed57..1644186e3b 100644
--- a/tests/pointer/1.0/Android.bp
+++ b/tests/pointer/1.0/Android.bp
@@ -125,7 +125,8 @@ genrule {
     name: "android.hardware.tests.pointer@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.pointer@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.tests.pointer@1.0-adapter",
diff --git a/tests/trie/1.0/Android.bp b/tests/trie/1.0/Android.bp
index 89269e5d25..27b5ea518a 100644
--- a/tests/trie/1.0/Android.bp
+++ b/tests/trie/1.0/Android.bp
@@ -120,7 +120,8 @@ genrule {
     name: "android.hardware.tests.trie@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.trie@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.tests.trie@1.0-adapter",
diff --git a/tetheroffload/config/1.0/Android.bp b/tetheroffload/config/1.0/Android.bp
index fbb4cf293a..705253d869 100644
--- a/tetheroffload/config/1.0/Android.bp
+++ b/tetheroffload/config/1.0/Android.bp
@@ -119,7 +119,8 @@ genrule {
     name: "android.hardware.tetheroffload.config@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tetheroffload.config@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.tetheroffload.config@1.0-adapter",
diff --git a/tetheroffload/control/1.0/Android.bp b/tetheroffload/control/1.0/Android.bp
index ba730a5f03..75750f0126 100644
--- a/tetheroffload/control/1.0/Android.bp
+++ b/tetheroffload/control/1.0/Android.bp
@@ -132,7 +132,8 @@ genrule {
     name: "android.hardware.tetheroffload.control@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tetheroffload.control@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.tetheroffload.control@1.0-adapter",
diff --git a/thermal/1.0/Android.bp b/thermal/1.0/Android.bp
index 406ca58293..da1e64184f 100644
--- a/thermal/1.0/Android.bp
+++ b/thermal/1.0/Android.bp
@@ -123,7 +123,8 @@ genrule {
     name: "android.hardware.thermal@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.thermal@1.0-adapter",
diff --git a/tv/cec/1.0/Android.bp b/tv/cec/1.0/Android.bp
index d2411459d4..10902ef3b0 100644
--- a/tv/cec/1.0/Android.bp
+++ b/tv/cec/1.0/Android.bp
@@ -132,7 +132,8 @@ genrule {
     name: "android.hardware.tv.cec@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.cec@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.tv.cec@1.0-adapter",
diff --git a/tv/input/1.0/Android.bp b/tv/input/1.0/Android.bp
index ef85bdefd0..36b2f132de 100644
--- a/tv/input/1.0/Android.bp
+++ b/tv/input/1.0/Android.bp
@@ -136,7 +136,8 @@ genrule {
     name: "android.hardware.tv.input@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.input@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.tv.input@1.0-adapter",
diff --git a/usb/1.0/Android.bp b/usb/1.0/Android.bp
index 676d8ce351..e97dbf996a 100644
--- a/usb/1.0/Android.bp
+++ b/usb/1.0/Android.bp
@@ -132,7 +132,8 @@ genrule {
     name: "android.hardware.usb@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.usb@1.0-adapter",
diff --git a/vibrator/1.0/Android.bp b/vibrator/1.0/Android.bp
index 8a34aa417f..0a48e00f74 100644
--- a/vibrator/1.0/Android.bp
+++ b/vibrator/1.0/Android.bp
@@ -123,7 +123,8 @@ genrule {
     name: "android.hardware.vibrator@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.vibrator@1.0-adapter",
diff --git a/vr/1.0/Android.bp b/vr/1.0/Android.bp
index bc44e7b423..5da5857325 100644
--- a/vr/1.0/Android.bp
+++ b/vr/1.0/Android.bp
@@ -119,7 +119,8 @@ genrule {
     name: "android.hardware.vr@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vr@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.vr@1.0-adapter",
diff --git a/wifi/1.0/Android.bp b/wifi/1.0/Android.bp
index 230b5a2a2c..088591ab5b 100644
--- a/wifi/1.0/Android.bp
+++ b/wifi/1.0/Android.bp
@@ -231,7 +231,8 @@ genrule {
     name: "android.hardware.wifi@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.wifi@1.0-adapter",
diff --git a/wifi/supplicant/1.0/Android.bp b/wifi/supplicant/1.0/Android.bp
index e9d37b0507..4bf8e6878e 100644
--- a/wifi/supplicant/1.0/Android.bp
+++ b/wifi/supplicant/1.0/Android.bp
@@ -222,7 +222,8 @@ genrule {
     name: "android.hardware.wifi.supplicant@1.0-adapter_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.0",
-    out: ["main.cpp"]}
+    out: ["main.cpp"]
+}
 
 cc_test {
     name: "android.hardware.wifi.supplicant@1.0-adapter",