diff options
| author | Steven Moreland <smoreland@google.com> | 2016-10-25 15:45:19 -0700 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2016-10-26 12:04:37 +0200 |
| commit | 69727778a74baacb880dffbd1c6692457932bf57 (patch) | |
| tree | a405157326d8fd32a064da21b60d31f6ad3d43db /light | |
| parent | 188ebec9948763f8287eeba84ff74b9a4aba3c4c (diff) | |
| download | platform_hardware_interfaces-69727778a74baacb880dffbd1c6692457932bf57.tar.gz platform_hardware_interfaces-69727778a74baacb880dffbd1c6692457932bf57.tar.bz2 platform_hardware_interfaces-69727778a74baacb880dffbd1c6692457932bf57.zip | |
Stop all these merge conflicts.
Test: mma -j64
Change-Id: I319198af32adf1fef180c5c2c22ba4b360fa7609
Diffstat (limited to 'light')
| -rw-r--r-- | light/2.0/Android.bp | 5 | ||||
| -rw-r--r-- | light/Android.bp | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/light/2.0/Android.bp b/light/2.0/Android.bp index a3b03a7841..33b4af25be 100644 --- a/light/2.0/Android.bp +++ b/light/2.0/Android.bp @@ -43,4 +43,9 @@ cc_library_shared { "libutils", "libcutils", ], +export_shared_lib_headers: [ + "libhidl", + "libhwbinder", + "libutils", + ], } diff --git a/light/Android.bp b/light/Android.bp new file mode 100644 index 0000000000..c12cd4f92d --- /dev/null +++ b/light/Android.bp @@ -0,0 +1,4 @@ +// This is an autogenerated file, do not edit. +subdirs = [ + "2.0", +] |