Remove Android.mk versions of modules that have been converted to Android.bp
The Android.mk versions of modules that have been converted to
Android.bp shouldn't be necessary, remove them. The only reason
to keep both seems to be b/113294940, which has an easy workaround.
Also convert car-media-common and its dependency car-arch-common,
which would otherwise need the workaround, as well as
CarMediaCommonRoboTests.
Test: m checkbuild
Test: m RunCarArchCommonRoboTests RunCarAppsCommonRoboTests
Test: m RunCarMediaCommonRoboTests
Change-Id: Id6491d2c254f691d2a410a59d50352f60b7ff352
diff --git a/car-ui-lib/tests/paintbooth/Android.bp b/car-ui-lib/tests/paintbooth/Android.bp
index 70d3c53..fe8d7a0 100644
--- a/car-ui-lib/tests/paintbooth/Android.bp
+++ b/car-ui-lib/tests/paintbooth/Android.bp
@@ -15,7 +15,7 @@
//
android_app {
- name: "PaintBooth-bp",
+ name: "PaintBooth",
srcs: ["src/**/*.java"],
@@ -28,7 +28,7 @@
privileged: true,
static_libs: [
- "car-ui-lib-bp",
+ "car-ui-lib",
"android.car.userlib",
],