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:05:29 +0200 |
| commit | 7a4f118c48e08fd3db62c82e3d56c1a8a300a171 (patch) | |
| tree | b645eff302c62b27abe27389050ce1e1bd4d7f2f /Android.bp | |
| parent | 54813ed7c631ee5bfa499e87da65cacbf10efc9b (diff) | |
Stop all these merge conflicts.
Test: mma -j64
Change-Id: I319198af32adf1fef180c5c2c22ba4b360fa7609
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/Android.bp b/Android.bp index f582790e82..7aef46b3f5 100644 --- a/Android.bp +++ b/Android.bp @@ -1,25 +1,3 @@ -// This is an autogenerated file, do not edit. subdirs = [ - "benchmarks/msgq/1.0", - "bluetooth/1.0", - "boot/1.0", - "boot/1.0/default", - "nfc/1.0", - "nfc/1.0/default", - "radio/1.0", - "tests/bar/1.0", - "tests/bar/1.0/default", - "tests/baz/1.0", - "tests/expression/1.0", - "tests/foo/1.0", - "tests/foo/1.0/default", - "tests/foo/1.0/default/lib", - "tests/libhwbinder/1.0", - "tests/libhwbinder/1.0/default", - "tests/msgq/1.0", - "tests/pointer/1.0", - "tests/pointer/1.0/default", - "tests/pointer/1.0/default/lib", - "wifi/1.0", - "wifi/supplicant/1.0", + "*" ] |