aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlix Espino <agespino@google.com>2022-04-25 17:50:39 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-25 17:50:39 +0000
commitdeb67bce73be0e8dffc31da26480122a3e5f2157 (patch)
treeec9c144c9989f0ed94d70e039d2e4fd7322cf327
parent5f1c9d874b10948c4fb6e2105f366fb26b2a575c (diff)
parent43cc79eaf385d9c84f1a56ac51d52e68a237f616 (diff)
downloadlibfuse-deb67bce73be0e8dffc31da26480122a3e5f2157.tar.gz
Merge "Deleted clang property in Android.bp files" am: c4fbc80900 am: 43cc79eaf3
Original change: https://android-review.googlesource.com/c/platform/external/libfuse/+/2063615 Change-Id: I5c6a73afd09ceaa58b67cf4e928c18daaae943a3 Ignore-AOSP-First: this is an automerge Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp11
1 files changed, 8 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index c862300..5373206 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,7 +41,10 @@ license {
cc_defaults {
name: "libfuse_default_flags",
- local_include_dirs: ["include/", "lib/"],
+ local_include_dirs: [
+ "include/",
+ "lib/",
+ ],
cflags: [
"-D_FILE_OFFSET_BITS=64",
"-DFUSERMOUNT_DIR=\"/system/bin\"",
@@ -56,7 +59,6 @@ cc_defaults {
"-Wno-unused-variable",
],
- clang: true,
sdk_version: "current",
min_sdk_version: "30",
@@ -70,7 +72,10 @@ cc_library {
"libfuse_default_flags",
],
- export_include_dirs: ["include", "lib"],
+ export_include_dirs: [
+ "include",
+ "lib",
+ ],
version_script: "lib/fuse_versionscript",