commit 5440b3663c8421e05da56bcae7e9b6b22e5b2d7e
author Alix Espino <agespino@google.com> Tue May 10 23:01:12 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 10 23:01:12 2022 +0000
tree ead3203d78e78a5da36ad3bdade32a62f4e870e0
parent 53cf63d1fd1d4a4bd238560d93706bdc7c6363af
parent ea13312de0560e6fa974ecddb75cb1a60699b310

Merge changes I07c0f96d,I8734474f

* changes:
  Deleted clang property in Android.bp files
  autogenerated reformatting by bpfmt

confirmationui/support/Android.bp

diff --git a/confirmationui/support/Android.bp b/confirmationui/support/Android.bp
index 6ab83f2..1200115 100644
--- a/confirmationui/support/Android.bp
+++ b/confirmationui/support/Android.bp
@@ -36,7 +36,7 @@
     ],
     export_include_dirs: [
         "include",
-    ]
+    ],
 }
 
 cc_test {
@@ -56,6 +56,5 @@
         "libhidlbase",
     ],
     test_suites: ["general-tests"],
-    clang: true,
-    cflags: [ "-O0" ],
+    cflags: ["-O0"],
 }

graphics/composer/2.1/utils/hwc2on1adapter/Android.bp

diff --git a/graphics/composer/2.1/utils/hwc2on1adapter/Android.bp b/graphics/composer/2.1/utils/hwc2on1adapter/Android.bp
index 0171dd6..3527cca 100644
--- a/graphics/composer/2.1/utils/hwc2on1adapter/Android.bp
+++ b/graphics/composer/2.1/utils/hwc2on1adapter/Android.bp
@@ -25,7 +25,6 @@
     name: "libhwc2on1adapter",
     vendor: true,
 
-    clang: true,
     cflags: [
         "-Wall",
         "-Werror",

graphics/composer/2.1/utils/hwc2onfbadapter/Android.bp

diff --git a/graphics/composer/2.1/utils/hwc2onfbadapter/Android.bp b/graphics/composer/2.1/utils/hwc2onfbadapter/Android.bp
index 3965d12..d613ba9 100644
--- a/graphics/composer/2.1/utils/hwc2onfbadapter/Android.bp
+++ b/graphics/composer/2.1/utils/hwc2onfbadapter/Android.bp
@@ -25,7 +25,6 @@
     name: "libhwc2onfbadapter",
     vendor: true,
 
-    clang: true,
     cflags: [
         "-Wall",
         "-Wextra",
@@ -37,6 +36,9 @@
     ],
 
     header_libs: ["libhardware_headers"],
-    shared_libs: ["liblog", "libsync"],
+    shared_libs: [
+        "liblog",
+        "libsync",
+    ],
     export_include_dirs: ["include"],
 }