summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Moreland2016-10-25 17:45:19 -0500
committerMartijn Coenen2016-10-26 05:04:37 -0500
commit69727778a74baacb880dffbd1c6692457932bf57 (patch)
treea405157326d8fd32a064da21b60d31f6ad3d43db /thermal
parent188ebec9948763f8287eeba84ff74b9a4aba3c4c (diff)
downloadplatform-hardware-interfaces-69727778a74baacb880dffbd1c6692457932bf57.tar.gz
platform-hardware-interfaces-69727778a74baacb880dffbd1c6692457932bf57.tar.xz
platform-hardware-interfaces-69727778a74baacb880dffbd1c6692457932bf57.zip
Stop all these merge conflicts.
Test: mma -j64 Change-Id: I319198af32adf1fef180c5c2c22ba4b360fa7609
Diffstat (limited to 'thermal')
-rw-r--r--thermal/1.0/Android.bp5
-rw-r--r--thermal/Android.bp5
2 files changed, 10 insertions, 0 deletions
diff --git a/thermal/1.0/Android.bp b/thermal/1.0/Android.bp
index 0c5dd19b..ae64ddee 100644
--- a/thermal/1.0/Android.bp
+++ b/thermal/1.0/Android.bp
@@ -43,4 +43,9 @@ cc_library_shared {
43 "libutils", 43 "libutils",
44 "libcutils", 44 "libcutils",
45 ], 45 ],
46export_shared_lib_headers: [
47 "libhidl",
48 "libhwbinder",
49 "libutils",
50 ],
46} 51}
diff --git a/thermal/Android.bp b/thermal/Android.bp
new file mode 100644
index 00000000..ba90f2c9
--- /dev/null
+++ b/thermal/Android.bp
@@ -0,0 +1,5 @@
1// This is an autogenerated file, do not edit.
2subdirs = [
3 "1.0",
4 "1.0/default",
5]