Snap for 5698743 from bcfafacf1ba20999353daafb64dbb88156e7c590 to qt-releaseandroid-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r1android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r46android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-tests-releaseandroid10-security-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-release

Change-Id: Ib37e5c8f66ea6ebd5d9488347873476dfd811e98

6 files changed, 12 insertions, 40 deletions

diff --git a/Android.mk b/Android.mk
index d1b2bb5..b3352d9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -46,20 +46,20 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
     androidx.lifecycle_lifecycle-livedata \
     androidx.sqlite_sqlite-framework \
     androidx.sqlite_sqlite \
-    bcradio-androidx-room-common-nodeps \
-    bcradio-androidx-room-runtime-nodeps
+    car-androidx-room-common-nodeps \
+    car-androidx-room-runtime-nodeps
 
 LOCAL_ANNOTATION_PROCESSORS := \
-    bcradio-androidx-annotation-nodeps \
-    bcradio-androidx-room-common-nodeps \
-    bcradio-androidx-room-compiler-nodeps \
-    bcradio-androidx-room-migration-nodeps \
-    bcradio-antlr4-nodeps \
-    bcradio-apache-commons-codec-nodeps \
-    bcradio-auto-common-nodeps \
-    bcradio-javapoet-nodeps \
-    bcradio-kotlin-metadata-nodeps \
-    bcradio-sqlite-jdbc-nodeps \
+    car-androidx-annotation-nodeps \
+    car-androidx-room-common-nodeps \
+    car-androidx-room-compiler-nodeps \
+    car-androidx-room-migration-nodeps \
+    car-antlr4-nodeps \
+    car-apache-commons-codec-nodeps \
+    car-auto-common-nodeps \
+    car-javapoet-nodeps \
+    car-kotlin-metadata-nodeps \
+    car-sqlite-jdbc-nodeps \
     guava-21.0 \
     kotlin-stdlib
 
@@ -86,32 +86,4 @@ LOCAL_RESOURCE_DIR += \
 
 include $(BUILD_PACKAGE)
 
-#########################################################
-
-include $(CLEAR_VARS)
-
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
-    bcradio-androidx-room-runtime-nodeps:libs/androidx.room/room-runtime-2.0.0-alpha1.aar \
-    bcradio-androidx-room-common-nodeps:libs/androidx.room/room-common-2.0.0-alpha1.jar
-
-include $(BUILD_MULTI_PREBUILT)
-
-include $(CLEAR_VARS)
-
-COMMON_LIBS_PATH := ../../../../prebuilts/tools/common/m2/repository
-
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
-    bcradio-androidx-room-common-nodeps:libs/androidx.room/room-common-2.0.0-alpha1.jar \
-    bcradio-androidx-room-compiler-nodeps:libs/androidx.room/room-compiler-2.0.0-alpha1.jar \
-    bcradio-androidx-room-migration-nodeps:libs/androidx.room/room-migration-2.0.0-alpha1.jar \
-    bcradio-androidx-annotation-nodeps:libs/annotation-1.0.0-alpha1.jar \
-    bcradio-antlr4-nodeps:$(COMMON_LIBS_PATH)/org/antlr/antlr4/4.5.3/antlr4-4.5.3.jar \
-    bcradio-apache-commons-codec-nodeps:$(COMMON_LIBS_PATH)/org/eclipse/tycho/tycho-bundles-external/0.18.1/eclipse/plugins/org.apache.commons.codec_1.4.0.v201209201156.jar \
-    bcradio-auto-common-nodeps:$(COMMON_LIBS_PATH)/com/google/auto/auto-common/0.9/auto-common-0.9.jar \
-    bcradio-javapoet-nodeps:$(COMMON_LIBS_PATH)/com/squareup/javapoet/1.8.0/javapoet-1.8.0.jar \
-    bcradio-kotlin-metadata-nodeps:$(COMMON_LIBS_PATH)/me/eugeniomarletti/kotlin-metadata/1.2.1/kotlin-metadata-1.2.1.jar \
-    bcradio-sqlite-jdbc-nodeps:$(COMMON_LIBS_PATH)/org/xerial/sqlite-jdbc/3.20.1/sqlite-jdbc-3.20.1.jar
-
-include $(BUILD_HOST_PREBUILT)
-
 endif
diff --git a/libs/androidx.room/room-common-2.0.0-alpha1.jar b/libs/androidx.room/room-common-2.0.0-alpha1.jar
deleted file mode 100644
index 2c09fdf..0000000
--- a/libs/androidx.room/room-common-2.0.0-alpha1.jar
+++ /dev/null
diff --git a/libs/androidx.room/room-compiler-2.0.0-alpha1.jar b/libs/androidx.room/room-compiler-2.0.0-alpha1.jar
deleted file mode 100644
index a95872d..0000000
--- a/libs/androidx.room/room-compiler-2.0.0-alpha1.jar
+++ /dev/null
diff --git a/libs/androidx.room/room-migration-2.0.0-alpha1.jar b/libs/androidx.room/room-migration-2.0.0-alpha1.jar
deleted file mode 100644
index 4851df9..0000000
--- a/libs/androidx.room/room-migration-2.0.0-alpha1.jar
+++ /dev/null
diff --git a/libs/androidx.room/room-runtime-2.0.0-alpha1.aar b/libs/androidx.room/room-runtime-2.0.0-alpha1.aar
deleted file mode 100644
index ca797dd..0000000
--- a/libs/androidx.room/room-runtime-2.0.0-alpha1.aar
+++ /dev/null
diff --git a/libs/annotation-1.0.0-alpha1.jar b/libs/annotation-1.0.0-alpha1.jar
deleted file mode 100644
index 3bfd348..0000000
--- a/libs/annotation-1.0.0-alpha1.jar
+++ /dev/null