merge in oc-release history after reset to oc-dev
diff --git a/Android.bp b/Android.bp
index 7b1dc8e..a8dda5d 100644
--- a/Android.bp
+++ b/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: {
