summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2018-03-07 23:17:43 +0100
committerandroid-build-merger <android-build-merger@google.com>2018-03-07 23:17:43 +0100
commit9b0c133ff565b1e8ae7399c5d1fcd0cf62533e53 (patch)
treebcff21e4491d4a85a7ad2c6de203db8e8d1877f2
parentMerge "Drop the no-op Android.bp." (diff)
parentMerge "Export fuse_sideload.h for libfusesideload." (diff)
downloadandroid_bootable_recovery-9b0c133ff565b1e8ae7399c5d1fcd0cf62533e53.tar
android_bootable_recovery-9b0c133ff565b1e8ae7399c5d1fcd0cf62533e53.tar.gz
android_bootable_recovery-9b0c133ff565b1e8ae7399c5d1fcd0cf62533e53.tar.bz2
android_bootable_recovery-9b0c133ff565b1e8ae7399c5d1fcd0cf62533e53.tar.lz
android_bootable_recovery-9b0c133ff565b1e8ae7399c5d1fcd0cf62533e53.tar.xz
android_bootable_recovery-9b0c133ff565b1e8ae7399c5d1fcd0cf62533e53.tar.zst
android_bootable_recovery-9b0c133ff565b1e8ae7399c5d1fcd0cf62533e53.zip
-rw-r--r--Android.mk12
-rw-r--r--fuse_sideload/Android.bp37
-rw-r--r--fuse_sideload/fuse_sideload.cpp (renamed from fuse_sideload.cpp)0
-rw-r--r--fuse_sideload/include/fuse_sideload.h (renamed from fuse_sideload.h)0
-rw-r--r--minadbd/Android.bp2
5 files changed, 38 insertions, 13 deletions
diff --git a/Android.mk b/Android.mk
index e8b899450..ed7192967 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,18 +18,6 @@ LOCAL_PATH := $(call my-dir)
RECOVERY_API_VERSION := 3
RECOVERY_FSTAB_VERSION := 2
-# libfusesideload (static library)
-# ===============================
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := fuse_sideload.cpp
-LOCAL_CFLAGS := -Wall -Werror
-LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE
-LOCAL_MODULE := libfusesideload
-LOCAL_STATIC_LIBRARIES := \
- libcrypto \
- libbase
-include $(BUILD_STATIC_LIBRARY)
-
# libmounts (static library)
# ===============================
include $(CLEAR_VARS)
diff --git a/fuse_sideload/Android.bp b/fuse_sideload/Android.bp
new file mode 100644
index 000000000..76bc16df9
--- /dev/null
+++ b/fuse_sideload/Android.bp
@@ -0,0 +1,37 @@
+// Copyright (C) 2018 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+cc_library_static {
+ name: "libfusesideload",
+
+ cflags: [
+ "-D_XOPEN_SOURCE",
+ "-D_GNU_SOURCE",
+ "-Wall",
+ "-Werror",
+ ],
+
+ srcs: [
+ "fuse_sideload.cpp",
+ ],
+
+ export_include_dirs: [
+ "include",
+ ],
+
+ static_libs: [
+ "libbase",
+ "libcrypto",
+ ],
+}
diff --git a/fuse_sideload.cpp b/fuse_sideload/fuse_sideload.cpp
index 1c7e98f01..1c7e98f01 100644
--- a/fuse_sideload.cpp
+++ b/fuse_sideload/fuse_sideload.cpp
diff --git a/fuse_sideload.h b/fuse_sideload/include/fuse_sideload.h
index 1b34cbdb0..1b34cbdb0 100644
--- a/fuse_sideload.h
+++ b/fuse_sideload/include/fuse_sideload.h
diff --git a/minadbd/Android.bp b/minadbd/Android.bp
index fcdb48272..432b2f0f5 100644
--- a/minadbd/Android.bp
+++ b/minadbd/Android.bp
@@ -22,7 +22,6 @@ cc_defaults {
],
include_dirs: [
- "bootable/recovery",
"system/core/adb",
],
}
@@ -41,6 +40,7 @@ cc_library_static {
],
static_libs: [
+ "libfusesideload",
"libbase",
"libcrypto",
],