Merge changes from topic 'avb-early-mount' into oc-dev
* changes:
fs_mgr: support AVB in fs_mgr_update_verity_state()
init: support early_mount with vboot 2.0 (external/avb/libavb)
fs_mgr: adds/changes some public APIs for early mount in init
fs_mgr_avb: refactors how vbmeta is loaded
fs_mgr: adding fs_mgr_get_slot_suffix() public API
diff --git a/base/Android.bp b/base/Android.bp
index 7b1dc8e..a8dda5d 100644
--- a/base/Android.bp
+++ b/base/Android.bp
@@ -20,8 +20,28 @@
"-Werror",
]
+cc_library_headers {
+ name: "libbase_headers",
+ vendor_available: true,
+ host_supported: true,
+ export_include_dirs: ["include"],
+
+ header_libs: ["libutils_headers"],
+ export_header_lib_headers: ["libutils_headers"],
+
+ target: {
+ linux_bionic: {
+ enabled: true,
+ },
+ windows: {
+ enabled: true,
+ },
+ },
+}
+
cc_library {
name: "libbase",
+ vendor_available: true,
clang: true,
host_supported: true,
srcs: [
@@ -33,9 +53,11 @@
"strings.cpp",
"test_utils.cpp",
],
- local_include_dirs: ["include"],
+
+ header_libs: ["libbase_headers"],
+ export_header_lib_headers: ["libbase_headers"],
+
cppflags: libbase_cppflags,
- export_include_dirs: ["include"],
shared_libs: ["liblog"],
target: {
android: {
diff --git a/libbacktrace/Android.bp b/libbacktrace/Android.bp
index 7de72a8..285aa6e 100644
--- a/libbacktrace/Android.bp
+++ b/libbacktrace/Android.bp
@@ -57,11 +57,13 @@
cc_library_headers {
name: "libbacktrace_headers",
+ vendor_available: true,
export_include_dirs: ["include"],
}
cc_library {
name: "libbacktrace",
+ vendor_available: true,
defaults: ["libbacktrace_common"],
host_supported: true,
diff --git a/libsync/Android.bp b/libsync/Android.bp
index e7dcf36..257d42d 100644
--- a/libsync/Android.bp
+++ b/libsync/Android.bp
@@ -22,6 +22,7 @@
cc_library_shared {
name: "libsync",
+ vendor_available: true,
defaults: ["libsync_defaults"],
}
diff --git a/libsync/include/ndk/sync.h b/libsync/include/ndk/sync.h
index 758a106..3c55783 100644
--- a/libsync/include/ndk/sync.h
+++ b/libsync/include/ndk/sync.h
@@ -69,8 +69,7 @@
* The returned array is owned by the parent sync file info, and has
* info->num_fences entries.
*/
-inline struct sync_fence_info *sync_get_fence_info(
- const struct sync_file_info *info) {
+static inline struct sync_fence_info* sync_get_fence_info(const struct sync_file_info* info) {
// This header should compile in C, but some C++ projects enable
// warnings-as-error for C-style casts.
#pragma GCC diagnostic push
diff --git a/libutils/Android.bp b/libutils/Android.bp
index 88c9efd..696db3b 100644
--- a/libutils/Android.bp
+++ b/libutils/Android.bp
@@ -16,8 +16,16 @@
name: "libutils_headers",
vendor_available: true,
host_supported: true,
+
+ header_libs: ["libsystem_headers",],
+ export_header_lib_headers: ["libsystem_headers",],
export_include_dirs: ["include"],
+
target: {
+ android: {
+ header_libs: ["libbacktrace_headers"],
+ export_header_lib_headers: ["libbacktrace_headers"],
+ },
linux_bionic: {
enabled: true,
},
@@ -59,11 +67,9 @@
cflags: ["-Werror"],
include_dirs: ["external/safe-iop/include"],
header_libs: [
- "libsystem_headers",
"libutils_headers",
],
export_header_lib_headers: [
- "libsystem_headers",
"libutils_headers",
],
diff --git a/libutils/ProcessCallStack.cpp b/libutils/ProcessCallStack.cpp
index ff8b32a..b8fb6dc 100644
--- a/libutils/ProcessCallStack.cpp
+++ b/libutils/ProcessCallStack.cpp
@@ -20,6 +20,8 @@
#include <utils/ProcessCallStack.h>
#include <dirent.h>
+#include <unistd.h>
+
#include <memory>
#include <utils/Printer.h>
diff --git a/libutils/misc.cpp b/libutils/misc.cpp
index 2608a65..ab72fe6 100644
--- a/libutils/misc.cpp
+++ b/libutils/misc.cpp
@@ -16,15 +16,11 @@
#define LOG_TAG "misc"
-//
-// Miscellaneous utility functions.
-//
#include <utils/misc.h>
+
+#include <pthread.h>
+
#include <utils/Log.h>
-
-#if !defined(_WIN32)
-#endif
-
#include <utils/Vector.h>
using namespace android;