diff options
| author | Alix Espino <agespino@google.com> | 2022-04-20 21:54:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-20 21:54:31 +0000 |
| commit | e07afb81e27b8feefbb161c24968ba14d1f6050e (patch) | |
| tree | 0fec3722104cc5ed032df259ebdc37ee1b6f1393 | |
| parent | 5891d7e486e3f2ba3fb74398cfce7ed082d5a85f (diff) | |
| parent | cf6eb0e5e775c96cf9fdfbad69d810e70465231e (diff) | |
| download | vold-e07afb81e27b8feefbb161c24968ba14d1f6050e.tar.gz | |
Merge "Deleted clang property in Android.bp files" am: df7ac92d33 am: 42c961198f am: cf6eb0e5e7
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2066564
Change-Id: I9e1928a7aaf6c549e553bb480aaec605c5495aea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -12,8 +12,6 @@ cc_defaults { "-Wno-unused-parameter", ], - clang: true, - tidy: true, tidy_checks: [ "-*", @@ -168,7 +166,7 @@ cc_library_static { ], whole_static_libs: [ "com.android.sysprop.apex", - "libc++fs" + "libc++fs", ], } @@ -209,7 +207,7 @@ cc_binary { "libarcvolume", ], }, - }, + }, } cc_binary { @@ -248,7 +246,10 @@ cc_binary { 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", |