Stop all these merge conflicts.
Test: mma -j64
Change-Id: I319198af32adf1fef180c5c2c22ba4b360fa7609
diff --git a/Android.bp b/Android.bp
index 1e930dc..7aef46b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,55 +1,3 @@
-// This is an autogenerated file, do not edit.
subdirs = [
- "audio/2.0",
- "audio/2.0/default",
- "audio/common/2.0",
- "audio/effect/2.0",
- "benchmarks/msgq/1.0",
- "biometrics/fingerprint/2.1",
- "bluetooth/1.0",
- "boot/1.0",
- "broadcastradio/1.0",
- "example/extension/light/2.0",
- "gnss/1.0",
- "graphics/allocator/2.0",
- "graphics/allocator/2.0/default",
- "graphics/composer/2.1",
- "graphics/composer/2.1/default",
- "graphics/mapper/2.0",
- "graphics/mapper/2.0/default",
- "light/2.0",
- "memtrack/1.0",
- "memtrack/1.0/default",
- "nfc/1.0",
- "nfc/1.0/default",
- "nfc/1.0/vts/functional",
- "power/1.0",
- "power/1.0/default",
- "radio/1.0",
- "sensors/1.0",
- "sensors/1.0/default",
- "soundtrigger/2.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",
- "thermal/1.0",
- "thermal/1.0/default",
- "tv/input/1.0",
- "vehicle/2.0",
- "vibrator/1.0",
- "vibrator/1.0/default",
- "vr/1.0",
- "vr/1.0/default",
- "wifi/1.0",
- "wifi/supplicant/1.0",
+ "*"
]