Export fuse_sideload.h for libfusesideload.

Move the module into a separate directory so that we can export only the
expected header.

With this change, minadbd no longer needs to include bootable/recovery.

Test: mmma -j bootable/recovery
Change-Id: I69b888ceb160a33a67d79c5bda208dc17ad6ed86
This commit is contained in:
Tao Bao 2018-03-06 22:05:25 -08:00
parent 8c7761edec
commit 4b51c3ab40
5 changed files with 38 additions and 13 deletions

View file

@ -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)

37
fuse_sideload/Android.bp Normal file
View file

@ -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",
],
}

View file

@ -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",
],