From 4b7dbd764a022af046dba1cdde1a03b31721c2b8 Mon Sep 17 00:00:00 2001
From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Thu, 4 Apr 2019 01:47:38 +0800
Subject: [PATCH] Android: move libfuse-lite to Android.bp

The library is also used by exfat.
---
 Android.bp | 26 ++++++++++++++++++++++++++
 Android.mk | 22 ----------------------
 2 files changed, 26 insertions(+), 22 deletions(-)
 create mode 100644 Android.bp

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 00000000..7a5dfd8c
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,26 @@
+//
+// Copyright (C) 2019 The Android-x86 Open Source Project
+//
+// Licensed under the GNU General Public License Version 2 or later.
+// You may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.gnu.org/licenses/gpl.html
+//
+
+// libfuse-lite
+cc_library_shared {
+    srcs: ["libfuse-lite/*.c"],
+
+    cflags: [
+        "-O2",
+        "-Wall",
+        "-D_FILE_OFFSET_BITS=64",
+        "-DHAVE_CONFIG_H",
+        "-DHAVE_LINUX_FS_H",
+    ],
+    name: "libfuse-lite",
+
+    local_include_dirs: ["include/fuse-lite"],
+    export_include_dirs: ["include/fuse-lite"],
+}
diff --git a/Android.mk b/Android.mk
index dd1d2fef..7bb7fd35 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,28 +12,6 @@ LOCAL_PATH := $(call my-dir)
 
 ntfs_3g_CFLAGS := -O2 -Wall -D_FILE_OFFSET_BITS=64 -DHAVE_CONFIG_H -DHAVE_LINUX_FS_H
 
-# libfuse-lite
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(addprefix libfuse-lite/, \
-	fuse.c \
-	fusermount.c \
-	fuse_kern_chan.c \
-	fuse_loop.c \
-	fuse_lowlevel.c \
-	fuse_opt.c \
-	fuse_session.c \
-	fuse_signals.c \
-	helper.c \
-	mount.c \
-	mount_util.c \
-)
-LOCAL_CFLAGS := $(ntfs_3g_CFLAGS)
-LOCAL_MODULE := libfuse-lite
-LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/fuse-lite
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_C_INCLUDES)
-include $(BUILD_SHARED_LIBRARY)
-
 # libntfs-3g
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(addprefix libntfs-3g/, \
-- 
2.11.0