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 /vehicle
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 'vehicle')
-rw-r--r--vehicle/2.0/Android.bp5
-rw-r--r--vehicle/Android.bp4
2 files changed, 9 insertions, 0 deletions
diff --git a/vehicle/2.0/Android.bp b/vehicle/2.0/Android.bp
index cb30e1bd..981103c2 100644
--- a/vehicle/2.0/Android.bp
+++ b/vehicle/2.0/Android.bp
@@ -51,4 +51,9 @@ cc_library_shared {
51 "libutils", 51 "libutils",
52 "libcutils", 52 "libcutils",
53 ], 53 ],
54export_shared_lib_headers: [
55 "libhidl",
56 "libhwbinder",
57 "libutils",
58 ],
54} 59}
diff --git a/vehicle/Android.bp b/vehicle/Android.bp
new file mode 100644
index 00000000..c12cd4f9
--- /dev/null
+++ b/vehicle/Android.bp
@@ -0,0 +1,4 @@
1// This is an autogenerated file, do not edit.
2subdirs = [
3 "2.0",
4]