aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Android.bp8
-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
6 files changed, 38 insertions, 21 deletions
diff --git a/Android.bp b/Android.bp
deleted file mode 100644
index f8c6a4b7..00000000
--- a/Android.bp
+++ /dev/null
@@ -1,8 +0,0 @@
1subdirs = [
2 "applypatch",
3 "bootloader_message",
4 "edify",
5 "otafault",
6 "otautil",
7 "uncrypt",
8]
diff --git a/Android.mk b/Android.mk
index e8b89945..ed719296 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,18 +18,6 @@ LOCAL_PATH := $(call my-dir)
18RECOVERY_API_VERSION := 3 18RECOVERY_API_VERSION := 3
19RECOVERY_FSTAB_VERSION := 2 19RECOVERY_FSTAB_VERSION := 2
20 20
21# libfusesideload (static library)
22# ===============================
23include $(CLEAR_VARS)
24LOCAL_SRC_FILES := fuse_sideload.cpp
25LOCAL_CFLAGS := -Wall -Werror
26LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE
27LOCAL_MODULE := libfusesideload
28LOCAL_STATIC_LIBRARIES := \
29 libcrypto \
30 libbase
31include $(BUILD_STATIC_LIBRARY)
32
33# libmounts (static library) 21# libmounts (static library)
34# =============================== 22# ===============================
35include $(CLEAR_VARS) 23include $(CLEAR_VARS)
diff --git a/fuse_sideload/Android.bp b/fuse_sideload/Android.bp
new file mode 100644
index 00000000..76bc16df
--- /dev/null
+++ b/fuse_sideload/Android.bp
@@ -0,0 +1,37 @@
1// Copyright (C) 2018 The Android Open Source Project
2//
3// Licensed under the Apache License, Version 2.0 (the "License");
4// you may not use this file except in compliance with the License.
5// You may obtain a copy of the License at
6//
7// http://www.apache.org/licenses/LICENSE-2.0
8//
9// Unless required by applicable law or agreed to in writing, software
10// distributed under the License is distributed on an "AS IS" BASIS,
11// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12// See the License for the specific language governing permissions and
13// limitations under the License.
14
15cc_library_static {
16 name: "libfusesideload",
17
18 cflags: [
19 "-D_XOPEN_SOURCE",
20 "-D_GNU_SOURCE",
21 "-Wall",
22 "-Werror",
23 ],
24
25 srcs: [
26 "fuse_sideload.cpp",
27 ],
28
29 export_include_dirs: [
30 "include",
31 ],
32
33 static_libs: [
34 "libbase",
35 "libcrypto",
36 ],
37}
diff --git a/fuse_sideload.cpp b/fuse_sideload/fuse_sideload.cpp
index 1c7e98f0..1c7e98f0 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 1b34cbdb..1b34cbdb 100644
--- a/fuse_sideload.h
+++ b/fuse_sideload/include/fuse_sideload.h
diff --git a/minadbd/Android.bp b/minadbd/Android.bp
index fcdb4827..432b2f0f 100644
--- a/minadbd/Android.bp
+++ b/minadbd/Android.bp
@@ -22,7 +22,6 @@ cc_defaults {
22 ], 22 ],
23 23
24 include_dirs: [ 24 include_dirs: [
25 "bootable/recovery",
26 "system/core/adb", 25 "system/core/adb",
27 ], 26 ],
28} 27}
@@ -41,6 +40,7 @@ cc_library_static {
41 ], 40 ],
42 41
43 static_libs: [ 42 static_libs: [
43 "libfusesideload",
44 "libbase", 44 "libbase",
45 "libcrypto", 45 "libcrypto",
46 ], 46 ],