Snap for 9301146 from 122a53bb257841ac07f9c25042df24c652d00ba0 to tm-qpr2-release

Change-Id: I0670e35bcd0afc58f7d2daa5979c71b5ae10d1a5

10 files changed, 7 insertions, 6 deletions

diff --git a/current/aaos-libs/car-apps-common.aar b/current/aaos-libs/car-apps-common.aar
index 558427b2e..6e46c154f 100644
--- a/current/aaos-libs/car-apps-common.aar
+++ b/current/aaos-libs/car-apps-common.aar
diff --git a/current/aaos-libs/car-assist-lib.aar b/current/aaos-libs/car-assist-lib.aar
index 3e68c9a37..2176e049a 100644
--- a/current/aaos-libs/car-assist-lib.aar
+++ b/current/aaos-libs/car-assist-lib.aar
diff --git a/current/aaos-libs/car-media-common.aar b/current/aaos-libs/car-media-common.aar
index 7fb9d9d21..5fe2af76d 100644
--- a/current/aaos-libs/car-media-common.aar
+++ b/current/aaos-libs/car-media-common.aar
diff --git a/current/aaos-libs/car-messaging-models.aar b/current/aaos-libs/car-messaging-models.aar
index 8dacbaced..cb07bf36f 100644
--- a/current/aaos-libs/car-messaging-models.aar
+++ b/current/aaos-libs/car-messaging-models.aar
diff --git a/current/aaos-libs/car-telephony-common.aar b/current/aaos-libs/car-telephony-common.aar
index 3d50ea826..5fa3d2a58 100644
--- a/current/aaos-libs/car-telephony-common.aar
+++ b/current/aaos-libs/car-telephony-common.aar
diff --git a/current/aaos-libs/car-ui-lib-oem-apis.jar b/current/aaos-libs/car-ui-lib-oem-apis.jar
index 75cd3054e..e814158ef 100644
--- a/current/aaos-libs/car-ui-lib-oem-apis.jar
+++ b/current/aaos-libs/car-ui-lib-oem-apis.jar
diff --git a/current/aaos-libs/car-ui-lib-testing-support.aar b/current/aaos-libs/car-ui-lib-testing-support.aar
index b6cda5ac1..3049c2fbd 100644
--- a/current/aaos-libs/car-ui-lib-testing-support.aar
+++ b/current/aaos-libs/car-ui-lib-testing-support.aar
diff --git a/current/aaos-libs/car-ui-lib.aar b/current/aaos-libs/car-ui-lib.aar
index 164b05c32..0295d38a9 100644
--- a/current/aaos-libs/car-ui-lib.aar
+++ b/current/aaos-libs/car-ui-lib.aar
diff --git a/current/aaos-libs/car-uxr-client-lib.aar b/current/aaos-libs/car-uxr-client-lib.aar
index 389ce6172..9edee81f8 100644
--- a/current/aaos-libs/car-uxr-client-lib.aar
+++ b/current/aaos-libs/car-uxr-client-lib.aar
diff --git a/current/aaos-libs/update_prebuilts.sh b/current/aaos-libs/update_prebuilts.sh
index 335eb4e3c..1738bca41 100755
--- a/current/aaos-libs/update_prebuilts.sh
+++ b/current/aaos-libs/update_prebuilts.sh
@@ -16,7 +16,7 @@ function downloadApp {
     # sudo apt update && \
     # sudo apt install android-fetch-artifact
 
-    CMD="fetch_artifact --bid $1 --target $TARGET --use_oauth2"
+    CMD="fetch_artifact --bid $1 --target $4 --use_oauth2"
 
     $CMD $2 $3
 }
@@ -41,13 +41,13 @@ case $LIB_TARGET in
         echo "Downloading car-telephony-common"
         downloadApp $1 "car-telephony-common.aar" "car-telephony-common.aar" $BUILD_TARGET
         echo "Downloading car-ui-lib"
-        downloadApp $1 "car-ui-lib.aar" "car-ui-lib.aar" $BUILD_TARGET
+        downloadApp $1 "car-ui-lib.aar" "car-ui-lib.aar" "car_apps-user"
         echo "Downloading car-ui-lib-oem-apis"
-        downloadApp $1 "car-ui-lib-oem-apis-jar.jar" "car-ui-lib-oem-apis.jar" $BUILD_TARGET
+        downloadApp $1 "car-ui-lib-oem-apis-jar.jar" "car-ui-lib-oem-apis.jar" "car_apps-user"
         echo "Downloading car-uxr-client-lib"
         downloadApp $1 "car-uxr-client-lib.aar" "car-uxr-client-lib.aar" $BUILD_TARGET
         echo "Downloading car-ui-lib-testing-support.aar"
-        downloadApp $1 "car-ui-lib-testing-support.aar" "car-ui-lib-testing-support.aar" $BUILD_TARGET
+        downloadApp $1 "car-ui-lib-testing-support.aar" "car-ui-lib-testing-support.aar" "car_apps-user"
         ;;
     car-apps-common)
         echo "Downloading car-apps-common"
@@ -75,9 +75,10 @@ case $LIB_TARGET in
         ;;
     car-ui-lib)
         echo "Downloading car-ui-lib"
-        downloadApp $1 "car-ui-lib.aar" "car-ui-lib.aar" $BUILD_TARGET
+        downloadApp $1 "car-ui-lib.aar" "car-ui-lib.aar" "car_apps-user"
         echo "Downloading car-ui-lib-oem-apis"
-        downloadApp $1 "car-ui-lib-oem-apis-jar.jar" "car-ui-lib-oem-apis.jar" $BUILD_TARGET
+        # TODO(b/258809109): car-ui-lib-oem-apis-jar.jar doesn't have a gradle target yet.
+        downloadApp $1 "car-ui-lib-oem-apis-jar.jar" "car-ui-lib-oem-apis.jar" "car_apps-user"
         # TODO(b/258809109): car-ui-lib-testing-support doesn't have a gradle target yet.
         echo "Downloading car-ui-lib-testing-support.aar"
         downloadApp $1 "car-ui-lib-testing-support.aar" "car-ui-lib-testing-support.aar" "car_apps-user"