Merge "Change download target to car_apps_gradle-all" into tm-qpr-dev

1 files changed, 34 insertions, 26 deletions

diff --git a/current/aaos-libs/update_prebuilts.sh b/current/aaos-libs/update_prebuilts.sh
index 8e91e9924..335eb4e3c 100755
--- a/current/aaos-libs/update_prebuilts.sh
+++ b/current/aaos-libs/update_prebuilts.sh
@@ -1,78 +1,86 @@
 #!/bin/bash
 set -eu
 
+# Usage: update_prebuilts.sh BUILD_ID {all|car-apps-common|car-assist-lib|car-media-common|car-messaging-models|car-uxr-client-lib|car-telephony-common|car-ui-lib} [TARGET]
+
 if [ -z "${1+x}" ]
 then
     echo "build id is required"
     exit 1
 fi
 
-LIB_TARGET=${2-all}
+function downloadApp {
+    echo "Build: " $1 " Target: " $4
+    # See go/fetch_artifact for details on fetch_artifact. To install it use:
+    # sudo glinux-add-repo android stable && \
+    # sudo apt update && \
+    # sudo apt install android-fetch-artifact
 
-cd $(dirname $0)
+    CMD="fetch_artifact --bid $1 --target $TARGET --use_oauth2"
 
-TARGET=car_apps-user
-# See go/fetch_artifact for details on fetch_artifact. To install it use:
-# sudo glinux-add-repo android stable && \
-# sudo apt update && \
-# sudo apt install android-fetch-artifact
+    $CMD $2 $3
+}
 
-CMD="fetch_artifact --bid $1 --target $TARGET --use_oauth2"
+LIB_TARGET=${2-all}
+BUILD_TARGET=${3-car_apps_gradle-all}
+
+cd $(dirname $0)
 
 shopt -s nocasematch
 case $LIB_TARGET in
     all)
         echo "Downloading all the libs"
         echo "Downloading car-apps-common"
-        $CMD car-apps-common.aar car-apps-common.aar
+        downloadApp $1 "car-apps-common.aar" "car-apps-common.aar" $BUILD_TARGET
         echo "Downloading car-assist-lib"
-        $CMD car-assist-lib.aar car-assist-lib.aar
+        downloadApp $1 "car-assist-lib.aar" "car-assist-lib.aar" $BUILD_TARGET
         echo "Downloading car-media-common"
-        $CMD car-media-common.aar car-media-common.aar
+        downloadApp $1 "car-media-common.aar" "car-media-common.aar" $BUILD_TARGET
         echo "Downloading car-messaging-models"
-        $CMD car-messaging-models.aar car-messaging-models.aar
+        downloadApp $1 "car-messaging-models.aar" "car-messaging-models.aar" $BUILD_TARGET
         echo "Downloading car-telephony-common"
-        $CMD car-telephony-common.aar car-telephony-common.aar
+        downloadApp $1 "car-telephony-common.aar" "car-telephony-common.aar" $BUILD_TARGET
         echo "Downloading car-ui-lib"
-        $CMD car-ui-lib.aar car-ui-lib.aar
+        downloadApp $1 "car-ui-lib.aar" "car-ui-lib.aar" $BUILD_TARGET
         echo "Downloading car-ui-lib-oem-apis"
-        $CMD car-ui-lib-oem-apis-jar.jar car-ui-lib-oem-apis.jar
+        downloadApp $1 "car-ui-lib-oem-apis-jar.jar" "car-ui-lib-oem-apis.jar" $BUILD_TARGET
         echo "Downloading car-uxr-client-lib"
-        $CMD car-uxr-client-lib.aar car-uxr-client-lib.aar
+        downloadApp $1 "car-uxr-client-lib.aar" "car-uxr-client-lib.aar" $BUILD_TARGET
         echo "Downloading car-ui-lib-testing-support.aar"
-        $CMD car-ui-lib-testing-support.aar car-ui-lib-testing-support.aar
+        downloadApp $1 "car-ui-lib-testing-support.aar" "car-ui-lib-testing-support.aar" $BUILD_TARGET
         ;;
     car-apps-common)
         echo "Downloading car-apps-common"
-        $CMD car-apps-common.aar car-apps-common.aar
+        downloadApp $1 "car-apps-common.aar" "car-apps-common.aar" $BUILD_TARGET
         ;;
     car-assist-lib)
         echo "Downloading car-assist-lib"
-        $CMD car-assist-lib.aar car-assist-lib.aar
+        downloadApp $1 "car-assist-lib.aar" "car-assist-lib.aar" $BUILD_TARGET
         ;;
     car-media-common)
         echo "Downloading car-media-common"
-        $CMD car-media-common.aar car-media-common.aar
+        downloadApp $1 "car-media-common.aar" "car-media-common.aar" $BUILD_TARGET
         ;;
     car-messaging-models)
         echo "Downloading car-messaging-models"
-        $CMD car-messaging-models.aar car-messaging-models.aar
+        downloadApp $1 "car-messaging-models.aar" "car-messaging-models.aar" $BUILD_TARGET
         ;;
     car-uxr-client-lib)
         echo "Downloading car-uxr-client-lib"
-        $CMD car-uxr-client-lib.aar car-uxr-client-lib.aar
+        downloadApp $1 "car-uxr-client-lib.aar" "car-uxr-client-lib.aar" $BUILD_TARGET
         ;;
     car-telephony-common)
         echo "Downloading car-telephony-common"
-        $CMD car-telephony-common.aar car-telephony-common.aar
+        downloadApp $1 "car-telephony-common.aar" "car-telephony-common.aar" $BUILD_TARGET
         ;;
     car-ui-lib)
         echo "Downloading car-ui-lib"
-        $CMD car-ui-lib.aar car-ui-lib.aar
+        downloadApp $1 "car-ui-lib.aar" "car-ui-lib.aar" $BUILD_TARGET
         echo "Downloading car-ui-lib-oem-apis"
-        $CMD car-ui-lib-oem-apis-jar.jar car-ui-lib-oem-apis.jar
+        downloadApp $1 "car-ui-lib-oem-apis-jar.jar" "car-ui-lib-oem-apis.jar" $BUILD_TARGET
+        # TODO(b/258809109): car-ui-lib-testing-support doesn't have a gradle target yet.
         echo "Downloading car-ui-lib-testing-support.aar"
-        $CMD car-ui-lib-testing-support.aar car-ui-lib-testing-support.aar
+        downloadApp $1 "car-ui-lib-testing-support.aar" "car-ui-lib-testing-support.aar" "car_apps-user"
         ;;
     *)
         echo "Invalid application option {all|car-apps-common|car-assist-lib|car-media-common|car-messaging-models|car-uxr-client-lib|car-telephony-common|car-ui-lib}"