Merge "Exporting C++ headers from system/core" am: 812b7d5d52

am: f484dd3401

Change-Id: I1c60ff535ef1e11cfca8ff942bf6c2fd11313ede

include/sysutils

@@ -0,0 +1 @@
+../libsysutils/include/sysutils/

include/utils

@@ -0,0 +1 @@
+../libutils/include/utils/

libsysutils/Android.mk

@@ -21,5 +21,7 @@ LOCAL_SHARED_LIBRARIES := \
         liblog \
         libnl
 
+LOCAL_EXPORT_C_INCLUDE_DIRS := system/core/libsysutils/include
+
 include $(BUILD_SHARED_LIBRARY)
 

libutils/Android.bp

@@ -12,6 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+cc_library_headers {
+    name: "libutils_headers",
+    host_supported: true,
+    export_include_dirs: ["include"],
+    target: {
+        windows: {
+           enabled: true,
+      },
+    },
+}
+
 cc_library {
     name: "libutils",
     host_supported: true,
@@ -42,6 +53,8 @@ cc_library {
 
     cflags: ["-Werror"],
     include_dirs: ["external/safe-iop/include"],
+    header_libs: ["libutils_headers"],
+    export_header_lib_headers: ["libutils_headers"],
 
     arch: {
         mips: {