commit cfe53c2c018eaac7991faa98b144543c8fcd174d
author Tao Bao <tbao@google.com> Tue Oct 03 14:37:21 2017 -0700
committer Tao Bao <tbao@google.com> Tue Oct 03 14:41:32 2017 -0700
tree 1d805fa745c42dd208dc011643adecc27bcd4c5a
parent dd7a4b5264c6e332dd6b02071e966f53a4e20050

otautil: Export headers.

Test: mmma bootable/recovery
Change-Id: Ic01b68e2a394d578fc9fc09da2dabe9061b98122

Android.mk

diff --git a/Android.mk b/Android.mk
index c55771f..ac72bac 100644
--- a/Android.mk
+++ b/Android.mk
@@ -56,6 +56,7 @@
 LOCAL_MODULE := librecovery
 LOCAL_STATIC_LIBRARIES := \
     libminui \
+    libotautil \
     libvintf_recovery \
     libcrypto_utils \
     libcrypto \

otautil/Android.bp

diff --git a/otautil/Android.bp b/otautil/Android.bp
index a2eaa04..9cde7ba 100644
--- a/otautil/Android.bp
+++ b/otautil/Android.bp
@@ -30,4 +30,8 @@
         "-Werror",
         "-Wall",
     ],
+
+    export_include_dirs: [
+        "include",
+    ],
 }

otautil/DirUtil.cpp

diff --git a/otautil/DirUtil.cpp b/otautil/DirUtil.cpp
index fffc822..61c8328 100644
--- a/otautil/DirUtil.cpp
+++ b/otautil/DirUtil.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "DirUtil.h"
+#include "otautil/DirUtil.h"
 
 #include <dirent.h>
 #include <errno.h>

otautil/SysUtil.cpp

diff --git a/otautil/SysUtil.cpp b/otautil/SysUtil.cpp
index dfa2150..d54a824 100644
--- a/otautil/SysUtil.cpp
+++ b/otautil/SysUtil.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "SysUtil.h"
+#include "otautil/SysUtil.h"
 
 #include <fcntl.h>
 #include <stdint.h>  // SIZE_MAX

otautil/ThermalUtil.cpp

diff --git a/otautil/ThermalUtil.cpp b/otautil/ThermalUtil.cpp
index 13d3643..5d9bd45 100644
--- a/otautil/ThermalUtil.cpp
+++ b/otautil/ThermalUtil.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "ThermalUtil.h"
+#include "otautil/ThermalUtil.h"
 
 #include <dirent.h>
 #include <stdio.h>
@@ -77,4 +77,4 @@
   }
   LOG(INFO) << "current maximum temperature: " << max_temperature;
   return max_temperature;
-}
\ No newline at end of file
+}

otautil/include/otautil/DirUtil.h

diff --git a/otautil/DirUtil.h b/otautil/include/otautil/DirUtil.h
similarity index 100%
rename from otautil/DirUtil.h
rename to otautil/include/otautil/DirUtil.h

otautil/include/otautil/SysUtil.h

diff --git a/otautil/SysUtil.h b/otautil/include/otautil/SysUtil.h
similarity index 100%
rename from otautil/SysUtil.h
rename to otautil/include/otautil/SysUtil.h

otautil/include/otautil/ThermalUtil.h

diff --git a/otautil/ThermalUtil.h b/otautil/include/otautil/ThermalUtil.h
similarity index 100%
rename from otautil/ThermalUtil.h
rename to otautil/include/otautil/ThermalUtil.h