From 3ce97170b1223821a362a4515fa0ce4109d72559 Mon Sep 17 00:00:00 2001
From: Alix <agespino@google.com>
Date: Mon, 25 Apr 2022 20:50:38 +0000
Subject: [PATCH 1/2] autogenerated reformatting by bpfmt

Bug: 208980553
Test: treehugger
Change-Id: I8734474f4e75bcf808701bcbc747bc53c64907cc
---
 confirmationui/support/Android.bp                      | 5 ++---
 graphics/composer/2.1/utils/hwc2onfbadapter/Android.bp | 5 ++++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/confirmationui/support/Android.bp b/confirmationui/support/Android.bp
index 6ab83f2bbe..1200115fcb 100644
--- a/confirmationui/support/Android.bp
+++ b/confirmationui/support/Android.bp
@@ -36,7 +36,7 @@ cc_library {
     ],
     export_include_dirs: [
         "include",
-    ]
+    ],
 }
 
 cc_test {
@@ -56,6 +56,5 @@ cc_test {
         "libhidlbase",
     ],
     test_suites: ["general-tests"],
-    clang: true,
-    cflags: [ "-O0" ],
+    cflags: ["-O0"],
 }
diff --git a/graphics/composer/2.1/utils/hwc2onfbadapter/Android.bp b/graphics/composer/2.1/utils/hwc2onfbadapter/Android.bp
index 3965d1217e..4ef530ebb8 100644
--- a/graphics/composer/2.1/utils/hwc2onfbadapter/Android.bp
+++ b/graphics/composer/2.1/utils/hwc2onfbadapter/Android.bp
@@ -37,6 +37,9 @@ cc_library_shared {
     ],
 
     header_libs: ["libhardware_headers"],
-    shared_libs: ["liblog", "libsync"],
+    shared_libs: [
+        "liblog",
+        "libsync",
+    ],
     export_include_dirs: ["include"],
 }

From ea13312de0560e6fa974ecddb75cb1a60699b310 Mon Sep 17 00:00:00 2001
From: Alix <agespino@google.com>
Date: Mon, 18 Apr 2022 03:45:44 +0000
Subject: [PATCH 2/2] Deleted clang property in Android.bp files

Deleted deprecated clang property in Android.bp files using bpmodify.

Bug: 208980553
Test: treehugger
Change-Id: I07c0f96d07ad39dfedfc7ede275b7794c58bf2d2
---
 graphics/composer/2.1/utils/hwc2on1adapter/Android.bp  | 1 -
 graphics/composer/2.1/utils/hwc2onfbadapter/Android.bp | 1 -
 2 files changed, 2 deletions(-)

diff --git a/graphics/composer/2.1/utils/hwc2on1adapter/Android.bp b/graphics/composer/2.1/utils/hwc2on1adapter/Android.bp
index 0171dd68c9..3527cca07f 100644
--- a/graphics/composer/2.1/utils/hwc2on1adapter/Android.bp
+++ b/graphics/composer/2.1/utils/hwc2on1adapter/Android.bp
@@ -25,7 +25,6 @@ cc_library_shared {
     name: "libhwc2on1adapter",
     vendor: true,
 
-    clang: true,
     cflags: [
         "-Wall",
         "-Werror",
diff --git a/graphics/composer/2.1/utils/hwc2onfbadapter/Android.bp b/graphics/composer/2.1/utils/hwc2onfbadapter/Android.bp
index 4ef530ebb8..d613ba9112 100644
--- a/graphics/composer/2.1/utils/hwc2onfbadapter/Android.bp
+++ b/graphics/composer/2.1/utils/hwc2onfbadapter/Android.bp
@@ -25,7 +25,6 @@ cc_library_shared {
     name: "libhwc2onfbadapter",
     vendor: true,
 
-    clang: true,
     cflags: [
         "-Wall",
         "-Wextra",