From cfe53c2c018eaac7991faa98b144543c8fcd174d Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Tue, 3 Oct 2017 14:37:21 -0700
Subject: [PATCH] otautil: Export headers.

Test: mmma bootable/recovery
Change-Id: Ic01b68e2a394d578fc9fc09da2dabe9061b98122
---
 Android.mk                                  | 1 +
 otautil/Android.bp                          | 4 ++++
 otautil/DirUtil.cpp                         | 2 +-
 otautil/SysUtil.cpp                         | 2 +-
 otautil/ThermalUtil.cpp                     | 4 ++--
 otautil/{ => include/otautil}/DirUtil.h     | 0
 otautil/{ => include/otautil}/SysUtil.h     | 0
 otautil/{ => include/otautil}/ThermalUtil.h | 0
 8 files changed, 9 insertions(+), 4 deletions(-)
 rename otautil/{ => include/otautil}/DirUtil.h (100%)
 rename otautil/{ => include/otautil}/SysUtil.h (100%)
 rename otautil/{ => include/otautil}/ThermalUtil.h (100%)

diff --git a/Android.mk b/Android.mk
index c55771fb..ac72bac0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -56,6 +56,7 @@ endif
 LOCAL_MODULE := librecovery
 LOCAL_STATIC_LIBRARIES := \
     libminui \
+    libotautil \
     libvintf_recovery \
     libcrypto_utils \
     libcrypto \
diff --git a/otautil/Android.bp b/otautil/Android.bp
index a2eaa040..9cde7baa 100644
--- a/otautil/Android.bp
+++ b/otautil/Android.bp
@@ -30,4 +30,8 @@ cc_library_static {
         "-Werror",
         "-Wall",
     ],
+
+    export_include_dirs: [
+        "include",
+    ],
 }
diff --git a/otautil/DirUtil.cpp b/otautil/DirUtil.cpp
index fffc8221..61c83281 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>
diff --git a/otautil/SysUtil.cpp b/otautil/SysUtil.cpp
index dfa21507..d54a824d 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
diff --git a/otautil/ThermalUtil.cpp b/otautil/ThermalUtil.cpp
index 13d36432..5d9bd45c 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 @@ int GetMaxValueFromThermalZone() {
   }
   LOG(INFO) << "current maximum temperature: " << max_temperature;
   return max_temperature;
-}
\ No newline at end of file
+}
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
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
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