Merge "otautil: Export headers." am: 2cedab7af9 am: b50d7cf9c9
am: d284e36fc6
Change-Id: I7b7f601bed669428fc8ded3fee9e15a732e90c3c
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 \
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",
+ ],
}
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>
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
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
+}
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