Merge "otautil: Export headers." am: 2cedab7af9 am: b50d7cf9c9

am: d284e36fc6

Change-Id: I7b7f601bed669428fc8ded3fee9e15a732e90c3c

Android.mk

@@ -56,6 +56,7 @@ endif
 LOCAL_MODULE := librecovery
 LOCAL_STATIC_LIBRARIES := \
     libminui \
+    libotautil \
     libvintf_recovery \
     libcrypto_utils \
     libcrypto \

otautil/Android.bp

@@ -30,4 +30,8 @@ cc_library_static {
         "-Werror",
         "-Wall",
     ],
+
+    export_include_dirs: [
+        "include",
+    ],
 }

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

@@ -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

@@ -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;
-}
+}