aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot2017-10-03 18:34:36 -0500
committerGerrit Code Review2017-10-03 18:34:36 -0500
commit2cedab7af95e1065cce1633de1b3acd5a40928f7 (patch)
tree149e16016b8bc8528524484dcd3a7f81e65fff30
parent16817312a6b1985d3f0afb6912051724e2695d8f (diff)
parentcfe53c2c018eaac7991faa98b144543c8fcd174d (diff)
downloadplatform-bootable-recovery-2cedab7af95e1065cce1633de1b3acd5a40928f7.tar.gz
platform-bootable-recovery-2cedab7af95e1065cce1633de1b3acd5a40928f7.tar.xz
platform-bootable-recovery-2cedab7af95e1065cce1633de1b3acd5a40928f7.zip
Merge "otautil: Export headers."
-rw-r--r--Android.mk1
-rw-r--r--otautil/Android.bp4
-rw-r--r--otautil/DirUtil.cpp2
-rw-r--r--otautil/SysUtil.cpp2
-rw-r--r--otautil/ThermalUtil.cpp4
-rw-r--r--otautil/include/otautil/DirUtil.h (renamed from otautil/DirUtil.h)0
-rw-r--r--otautil/include/otautil/SysUtil.h (renamed from otautil/SysUtil.h)0
-rw-r--r--otautil/include/otautil/ThermalUtil.h (renamed from otautil/ThermalUtil.h)0
8 files changed, 9 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index c55771fb..ac72bac0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -56,6 +56,7 @@ endif
56LOCAL_MODULE := librecovery 56LOCAL_MODULE := librecovery
57LOCAL_STATIC_LIBRARIES := \ 57LOCAL_STATIC_LIBRARIES := \
58 libminui \ 58 libminui \
59 libotautil \
59 libvintf_recovery \ 60 libvintf_recovery \
60 libcrypto_utils \ 61 libcrypto_utils \
61 libcrypto \ 62 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 {
30 "-Werror", 30 "-Werror",
31 "-Wall", 31 "-Wall",
32 ], 32 ],
33
34 export_include_dirs: [
35 "include",
36 ],
33} 37}
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 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17#include "DirUtil.h" 17#include "otautil/DirUtil.h"
18 18
19#include <dirent.h> 19#include <dirent.h>
20#include <errno.h> 20#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 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17#include "SysUtil.h" 17#include "otautil/SysUtil.h"
18 18
19#include <fcntl.h> 19#include <fcntl.h>
20#include <stdint.h> // SIZE_MAX 20#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 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17#include "ThermalUtil.h" 17#include "otautil/ThermalUtil.h"
18 18
19#include <dirent.h> 19#include <dirent.h>
20#include <stdio.h> 20#include <stdio.h>
@@ -77,4 +77,4 @@ int GetMaxValueFromThermalZone() {
77 } 77 }
78 LOG(INFO) << "current maximum temperature: " << max_temperature; 78 LOG(INFO) << "current maximum temperature: " << max_temperature;
79 return max_temperature; 79 return max_temperature;
80} \ No newline at end of file 80}
diff --git a/otautil/DirUtil.h b/otautil/include/otautil/DirUtil.h
index 85d6c16d..85d6c16d 100644
--- a/otautil/DirUtil.h
+++ b/otautil/include/otautil/DirUtil.h
diff --git a/otautil/SysUtil.h b/otautil/include/otautil/SysUtil.h
index 52f6d20a..52f6d20a 100644
--- a/otautil/SysUtil.h
+++ b/otautil/include/otautil/SysUtil.h
diff --git a/otautil/ThermalUtil.h b/otautil/include/otautil/ThermalUtil.h
index 43ab5594..43ab5594 100644
--- a/otautil/ThermalUtil.h
+++ b/otautil/include/otautil/ThermalUtil.h