commit cf6eb0e5e775c96cf9fdfbad69d810e70465231e
author Alix Espino <agespino@google.com> Wed Apr 20 21:38:24 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 20 21:38:24 2022 +0000
tree 2f6637e51472d386b77f8221c8b1747c9af511bb
parent aa259e7ee02d32312752e202a1c0dfcbb163cbfd
parent 42c961198f1f2faca186b251478c6568bc9ca6f6

Merge "Deleted clang property in Android.bp files" am: df7ac92d33 am: 42c961198f

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2066564

Change-Id: Ifb57301330cd2bec3c0cfed95e0e60206573b022
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index c113ed0..8f413c4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,8 +12,6 @@
         "-Wno-unused-parameter",
     ],
 
-    clang: true,
-
     tidy: true,
     tidy_checks: [
         "-*",
@@ -168,7 +166,7 @@
     ],
     whole_static_libs: [
         "com.android.sysprop.apex",
-        "libc++fs"
+        "libc++fs",
     ],
 }
 
@@ -209,7 +207,7 @@
                 "libarcvolume",
             ],
         },
-	},
+    },
 }
 
 cc_binary {
@@ -248,7 +246,10 @@
     name: "vold_prepare_subdirs",
     defaults: ["vold_default_flags"],
 
-    srcs: ["vold_prepare_subdirs.cpp", "Utils.cpp"],
+    srcs: [
+        "vold_prepare_subdirs.cpp",
+        "Utils.cpp",
+    ],
     shared_libs: [
         "libbase",
         "libcutils",