Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a4f118c authored by Steven Moreland's avatar Steven Moreland Committed by Martijn Coenen
Browse files

Stop all these merge conflicts. 

Test: mma -j64
Change-Id: I319198af32adf1fef180c5c2c22ba4b360fa7609
parent 54813ed7

Android.bp

+1 −23
Original line number Diff line number Diff line 
// 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",

    "*"

]

benchmarks/Android.bp

0 → 100644
+4 −0
Original line number Diff line number Diff line 
// This is an autogenerated file, do not edit.

subdirs = [

    "msgq/1.0",

]

bluetooth/Android.bp

0 → 100644
+4 −0
Original line number Diff line number Diff line 
// This is an autogenerated file, do not edit.

subdirs = [

    "1.0",

]

boot/Android.bp

0 → 100644
+4 −0
Original line number Diff line number Diff line 
// This is an autogenerated file, do not edit.

subdirs = [

    "1.0",

]

nfc/Android.bp

0 → 100644
+5 −0
Original line number Diff line number Diff line 
// This is an autogenerated file, do not edit.

subdirs = [

    "1.0",

    "1.0/default",

]