Merge "Revert "Update ConstraintLayout to 2.2.0-alpha05"" into tm-qpr-dev
diff --git a/current/aaos-libs/car-apps-common.aar b/current/aaos-libs/car-apps-common.aar
index 558427b..6e46c15 100644
--- a/current/aaos-libs/car-apps-common.aar
+++ b/current/aaos-libs/car-apps-common.aar
Binary files differ
diff --git a/current/aaos-libs/car-assist-lib.aar b/current/aaos-libs/car-assist-lib.aar
index 3e68c9a..2176e04 100644
--- a/current/aaos-libs/car-assist-lib.aar
+++ b/current/aaos-libs/car-assist-lib.aar
Binary files differ
diff --git a/current/aaos-libs/car-media-common.aar b/current/aaos-libs/car-media-common.aar
index 7fb9d9d..5fe2af7 100644
--- a/current/aaos-libs/car-media-common.aar
+++ b/current/aaos-libs/car-media-common.aar
Binary files differ
diff --git a/current/aaos-libs/car-messaging-models.aar b/current/aaos-libs/car-messaging-models.aar
index 8dacbac..cb07bf3 100644
--- a/current/aaos-libs/car-messaging-models.aar
+++ b/current/aaos-libs/car-messaging-models.aar
Binary files differ
diff --git a/current/aaos-libs/car-telephony-common.aar b/current/aaos-libs/car-telephony-common.aar
index 3d50ea8..5fa3d2a 100644
--- a/current/aaos-libs/car-telephony-common.aar
+++ b/current/aaos-libs/car-telephony-common.aar
Binary files differ
diff --git a/current/aaos-libs/car-ui-lib-oem-apis.jar b/current/aaos-libs/car-ui-lib-oem-apis.jar
index 75cd305..e814158 100644
--- a/current/aaos-libs/car-ui-lib-oem-apis.jar
+++ b/current/aaos-libs/car-ui-lib-oem-apis.jar
Binary files differ
diff --git a/current/aaos-libs/car-ui-lib-testing-support.aar b/current/aaos-libs/car-ui-lib-testing-support.aar
index b6cda5a..3049c2f 100644
--- a/current/aaos-libs/car-ui-lib-testing-support.aar
+++ b/current/aaos-libs/car-ui-lib-testing-support.aar
Binary files differ
diff --git a/current/aaos-libs/car-ui-lib.aar b/current/aaos-libs/car-ui-lib.aar
index 164b05c..0295d38 100644
--- a/current/aaos-libs/car-ui-lib.aar
+++ b/current/aaos-libs/car-ui-lib.aar
Binary files differ
diff --git a/current/aaos-libs/car-uxr-client-lib.aar b/current/aaos-libs/car-uxr-client-lib.aar
index 389ce61..9edee81 100644
--- a/current/aaos-libs/car-uxr-client-lib.aar
+++ b/current/aaos-libs/car-uxr-client-lib.aar
Binary files differ
diff --git a/current/aaos-libs/update_prebuilts.sh b/current/aaos-libs/update_prebuilts.sh
index 335eb4e..1738bca 100755
--- a/current/aaos-libs/update_prebuilts.sh
+++ b/current/aaos-libs/update_prebuilts.sh
@@ -16,7 +16,7 @@
# 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 @@
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 @@
;;
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"