Exporting C++ headers from system/core

Moved headers from include/libutils and include/libsysutils to
libutils/include and libsysutils/include respectively, so they can be
exported via these libs. They needed to be moved since Soong does
not allow export from external folder.

Added symlink from old locations. They are needed since Soong
includes system/core/include by default. Once all modules are
cleaned up to explicitly add the required libs, the symlinks will be
removed.

Moved headers of libutils to libutils_headers. They should be used
by modules for header-only inlines. Added libutils_headers as
dependency of libutils.

Split of C++ headers into those that have no dependency and those that
have dependency on libutils.so will be handled in a later CL.

Test: Add above libs to shared lib of local module
Change-Id: I122db72056b26b1f39bad1d9a0c2a1c5efda3550

61 files changed, 17 insertions, 0 deletions

diff --git a/include/sysutils b/include/sysutils
new file mode 120000
index 000000000..1c8e85bd1
--- /dev/null
+++ b/include/sysutils
@@ -0,0 +1 @@
+../libsysutils/include/sysutils/
\ No newline at end of file
diff --git a/include/utils b/include/utils
new file mode 120000
index 000000000..e8476fd19
--- /dev/null
+++ b/include/utils
@@ -0,0 +1 @@
+../libutils/include/utils/
\ No newline at end of file
diff --git a/libsysutils/Android.mk b/libsysutils/Android.mk
index 7bf53e391..330d6cbf1 100644
--- a/libsysutils/Android.mk
+++ b/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)
 
diff --git a/include/sysutils/FrameworkClient.h b/libsysutils/include/sysutils/FrameworkClient.h
index 4a3f0de0e..4a3f0de0e 100644
--- a/include/sysutils/FrameworkClient.h
+++ b/libsysutils/include/sysutils/FrameworkClient.h
diff --git a/include/sysutils/FrameworkCommand.h b/libsysutils/include/sysutils/FrameworkCommand.h
index 3e6264bbd..3e6264bbd 100644
--- a/include/sysutils/FrameworkCommand.h
+++ b/libsysutils/include/sysutils/FrameworkCommand.h
diff --git a/include/sysutils/FrameworkListener.h b/libsysutils/include/sysutils/FrameworkListener.h
index 2137069fb..2137069fb 100644
--- a/include/sysutils/FrameworkListener.h
+++ b/libsysutils/include/sysutils/FrameworkListener.h
diff --git a/include/sysutils/List.h b/libsysutils/include/sysutils/List.h
index 31f7b37c1..31f7b37c1 100644
--- a/include/sysutils/List.h
+++ b/libsysutils/include/sysutils/List.h
diff --git a/include/sysutils/NetlinkEvent.h b/libsysutils/include/sysutils/NetlinkEvent.h
index b80f3ea44..b80f3ea44 100644
--- a/include/sysutils/NetlinkEvent.h
+++ b/libsysutils/include/sysutils/NetlinkEvent.h
diff --git a/include/sysutils/NetlinkListener.h b/libsysutils/include/sysutils/NetlinkListener.h
index 82465d697..82465d697 100644
--- a/include/sysutils/NetlinkListener.h
+++ b/libsysutils/include/sysutils/NetlinkListener.h
diff --git a/include/sysutils/ServiceManager.h b/libsysutils/include/sysutils/ServiceManager.h
index c31dd8f22..c31dd8f22 100644
--- a/include/sysutils/ServiceManager.h
+++ b/libsysutils/include/sysutils/ServiceManager.h
diff --git a/include/sysutils/SocketClient.h b/libsysutils/include/sysutils/SocketClient.h
index 1004f0611..1004f0611 100644
--- a/include/sysutils/SocketClient.h
+++ b/libsysutils/include/sysutils/SocketClient.h
diff --git a/include/sysutils/SocketClientCommand.h b/libsysutils/include/sysutils/SocketClientCommand.h
index 746bc2587..746bc2587 100644
--- a/include/sysutils/SocketClientCommand.h
+++ b/libsysutils/include/sysutils/SocketClientCommand.h
diff --git a/include/sysutils/SocketListener.h b/libsysutils/include/sysutils/SocketListener.h
index bc93b8635..bc93b8635 100644
--- a/include/sysutils/SocketListener.h
+++ b/libsysutils/include/sysutils/SocketListener.h
diff --git a/libutils/Android.bp b/libutils/Android.bp
index 217b8c378..0c777b103 100644
--- a/libutils/Android.bp
+++ b/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: {
diff --git a/include/utils/AndroidThreads.h b/libutils/include/utils/AndroidThreads.h
index 4c2dd49f6..4c2dd49f6 100644
--- a/include/utils/AndroidThreads.h
+++ b/libutils/include/utils/AndroidThreads.h
diff --git a/include/utils/Atomic.h b/libutils/include/utils/Atomic.h
index 7eb476c94..7eb476c94 100644
--- a/include/utils/Atomic.h
+++ b/libutils/include/utils/Atomic.h
diff --git a/include/utils/BitSet.h b/libutils/include/utils/BitSet.h
index 8c612931d..8c612931d 100644
--- a/include/utils/BitSet.h
+++ b/libutils/include/utils/BitSet.h
diff --git a/include/utils/BlobCache.h b/libutils/include/utils/BlobCache.h
index 65dca9fb4..65dca9fb4 100644
--- a/include/utils/BlobCache.h
+++ b/libutils/include/utils/BlobCache.h
diff --git a/include/utils/ByteOrder.h b/libutils/include/utils/ByteOrder.h
index 44ea13df8..44ea13df8 100644
--- a/include/utils/ByteOrder.h
+++ b/libutils/include/utils/ByteOrder.h
diff --git a/include/utils/CallStack.h b/libutils/include/utils/CallStack.h
index 27e89f462..27e89f462 100644
--- a/include/utils/CallStack.h
+++ b/libutils/include/utils/CallStack.h
diff --git a/include/utils/Compat.h b/libutils/include/utils/Compat.h
index 2709e3b32..2709e3b32 100644
--- a/include/utils/Compat.h
+++ b/libutils/include/utils/Compat.h
diff --git a/include/utils/Condition.h b/libutils/include/utils/Condition.h
index 25a53aa23..25a53aa23 100644
--- a/include/utils/Condition.h
+++ b/libutils/include/utils/Condition.h
diff --git a/include/utils/Debug.h b/libutils/include/utils/Debug.h
index 08893bdaa..08893bdaa 100644
--- a/include/utils/Debug.h
+++ b/libutils/include/utils/Debug.h
diff --git a/include/utils/Endian.h b/libutils/include/utils/Endian.h
index 591cae0d3..591cae0d3 100644
--- a/include/utils/Endian.h
+++ b/libutils/include/utils/Endian.h
diff --git a/include/utils/Errors.h b/libutils/include/utils/Errors.h
index 16e1fa2c2..16e1fa2c2 100644
--- a/include/utils/Errors.h
+++ b/libutils/include/utils/Errors.h
diff --git a/include/utils/FastStrcmp.h b/libutils/include/utils/FastStrcmp.h
index 3844e7d96..3844e7d96 100644
--- a/include/utils/FastStrcmp.h
+++ b/libutils/include/utils/FastStrcmp.h
diff --git a/include/utils/FileMap.h b/libutils/include/utils/FileMap.h
index 7d372e1dc..7d372e1dc 100644
--- a/include/utils/FileMap.h
+++ b/libutils/include/utils/FileMap.h
diff --git a/include/utils/Flattenable.h b/libutils/include/utils/Flattenable.h
index 22b811a14..22b811a14 100644
--- a/include/utils/Flattenable.h
+++ b/libutils/include/utils/Flattenable.h
diff --git a/include/utils/Functor.h b/libutils/include/utils/Functor.h
index 09ea614b6..09ea614b6 100644
--- a/include/utils/Functor.h
+++ b/libutils/include/utils/Functor.h
diff --git a/include/utils/JenkinsHash.h b/libutils/include/utils/JenkinsHash.h
index 027c10c7e..027c10c7e 100644
--- a/include/utils/JenkinsHash.h
+++ b/libutils/include/utils/JenkinsHash.h
diff --git a/include/utils/KeyedVector.h b/libutils/include/utils/KeyedVector.h
index f93ad6e21..f93ad6e21 100644
--- a/include/utils/KeyedVector.h
+++ b/libutils/include/utils/KeyedVector.h
diff --git a/include/utils/LinearTransform.h b/libutils/include/utils/LinearTransform.h
index 04cb355c7..04cb355c7 100644
--- a/include/utils/LinearTransform.h
+++ b/libutils/include/utils/LinearTransform.h
diff --git a/include/utils/List.h b/libutils/include/utils/List.h
index 403cd7f1e..403cd7f1e 100644
--- a/include/utils/List.h
+++ b/libutils/include/utils/List.h
diff --git a/include/utils/Log.h b/libutils/include/utils/Log.h
index 5276a498d..5276a498d 100644
--- a/include/utils/Log.h
+++ b/libutils/include/utils/Log.h
diff --git a/include/utils/Looper.h b/libutils/include/utils/Looper.h
index a62e67f5f..a62e67f5f 100644
--- a/include/utils/Looper.h
+++ b/libutils/include/utils/Looper.h
diff --git a/include/utils/LruCache.h b/libutils/include/utils/LruCache.h
index 89dccd613..89dccd613 100644
--- a/include/utils/LruCache.h
+++ b/libutils/include/utils/LruCache.h
diff --git a/include/utils/Mutex.h b/libutils/include/utils/Mutex.h
index d106185f0..d106185f0 100644
--- a/include/utils/Mutex.h
+++ b/libutils/include/utils/Mutex.h
diff --git a/include/utils/NativeHandle.h b/libutils/include/utils/NativeHandle.h
index b82516879..b82516879 100644
--- a/include/utils/NativeHandle.h
+++ b/libutils/include/utils/NativeHandle.h
diff --git a/include/utils/Printer.h b/libutils/include/utils/Printer.h
index bb6628767..bb6628767 100644
--- a/include/utils/Printer.h
+++ b/libutils/include/utils/Printer.h
diff --git a/include/utils/ProcessCallStack.h b/libutils/include/utils/ProcessCallStack.h
index 32458b8b1..32458b8b1 100644
--- a/include/utils/ProcessCallStack.h
+++ b/libutils/include/utils/ProcessCallStack.h
diff --git a/include/utils/PropertyMap.h b/libutils/include/utils/PropertyMap.h
index a9e674f9a..a9e674f9a 100644
--- a/include/utils/PropertyMap.h
+++ b/libutils/include/utils/PropertyMap.h
diff --git a/include/utils/RWLock.h b/libutils/include/utils/RWLock.h
index d5b81d3a8..d5b81d3a8 100644
--- a/include/utils/RWLock.h
+++ b/libutils/include/utils/RWLock.h
diff --git a/include/utils/RefBase.h b/libutils/include/utils/RefBase.h
index 36016cde6..36016cde6 100644
--- a/include/utils/RefBase.h
+++ b/libutils/include/utils/RefBase.h
diff --git a/include/utils/Singleton.h b/libutils/include/utils/Singleton.h
index 7cc4c18be..7cc4c18be 100644
--- a/include/utils/Singleton.h
+++ b/libutils/include/utils/Singleton.h
diff --git a/include/utils/SortedVector.h b/libutils/include/utils/SortedVector.h
index 86f349645..86f349645 100644
--- a/include/utils/SortedVector.h
+++ b/libutils/include/utils/SortedVector.h
diff --git a/include/utils/StopWatch.h b/libutils/include/utils/StopWatch.h
index 693dd3ccf..693dd3ccf 100644
--- a/include/utils/StopWatch.h
+++ b/libutils/include/utils/StopWatch.h
diff --git a/include/utils/String16.h b/libutils/include/utils/String16.h
index 07c4de746..07c4de746 100644
--- a/include/utils/String16.h
+++ b/libutils/include/utils/String16.h
diff --git a/include/utils/String8.h b/libutils/include/utils/String8.h
index 1d12994d1..1d12994d1 100644
--- a/include/utils/String8.h
+++ b/libutils/include/utils/String8.h
diff --git a/include/utils/StrongPointer.h b/libutils/include/utils/StrongPointer.h
index 294e6b6f4..294e6b6f4 100644
--- a/include/utils/StrongPointer.h
+++ b/libutils/include/utils/StrongPointer.h
diff --git a/include/utils/SystemClock.h b/libutils/include/utils/SystemClock.h
index 01db34078..01db34078 100644
--- a/include/utils/SystemClock.h
+++ b/libutils/include/utils/SystemClock.h
diff --git a/include/utils/Thread.h b/libutils/include/utils/Thread.h
index a261fc8d9..a261fc8d9 100644
--- a/include/utils/Thread.h
+++ b/libutils/include/utils/Thread.h
diff --git a/include/utils/ThreadDefs.h b/libutils/include/utils/ThreadDefs.h
index ae091e40f..ae091e40f 100644
--- a/include/utils/ThreadDefs.h
+++ b/libutils/include/utils/ThreadDefs.h
diff --git a/include/utils/Timers.h b/libutils/include/utils/Timers.h
index 54ec47489..54ec47489 100644
--- a/include/utils/Timers.h
+++ b/libutils/include/utils/Timers.h
diff --git a/include/utils/Tokenizer.h b/libutils/include/utils/Tokenizer.h
index bb25f374c..bb25f374c 100644
--- a/include/utils/Tokenizer.h
+++ b/libutils/include/utils/Tokenizer.h
diff --git a/include/utils/Trace.h b/libutils/include/utils/Trace.h
index eeba40d65..eeba40d65 100644
--- a/include/utils/Trace.h
+++ b/libutils/include/utils/Trace.h
diff --git a/include/utils/TypeHelpers.h b/libutils/include/utils/TypeHelpers.h
index 2a2522722..2a2522722 100644
--- a/include/utils/TypeHelpers.h
+++ b/libutils/include/utils/TypeHelpers.h
diff --git a/include/utils/Unicode.h b/libutils/include/utils/Unicode.h
index 666b70f4e..666b70f4e 100644
--- a/include/utils/Unicode.h
+++ b/libutils/include/utils/Unicode.h
diff --git a/include/utils/Vector.h b/libutils/include/utils/Vector.h
index 28a77b834..28a77b834 100644
--- a/include/utils/Vector.h
+++ b/libutils/include/utils/Vector.h
diff --git a/include/utils/VectorImpl.h b/libutils/include/utils/VectorImpl.h
index 4dd91fd29..4dd91fd29 100644
--- a/include/utils/VectorImpl.h
+++ b/libutils/include/utils/VectorImpl.h
diff --git a/include/utils/misc.h b/libutils/include/utils/misc.h
index 6cccec387..6cccec387 100644
--- a/include/utils/misc.h
+++ b/libutils/include/utils/misc.h
diff --git a/include/utils/threads.h b/libutils/include/utils/threads.h
index 9de338211..9de338211 100644
--- a/include/utils/threads.h
+++ b/libutils/include/utils/threads.h