From b9c8d55605a0e399a7c1f9b0bc1da37922e0758a Mon Sep 17 00:00:00 2001 From: Tyler Nijmeh Date: Thu, 11 Apr 2019 20:23:53 -0700 Subject: [PATCH] build-dakkar: Always fetch the latest branch for AOSP builds Rather than manually updating each branch when a new one comes out, we can just fetch the latest branch in the tree and use that. Signed-off-by: Tyler Nijmeh --- build-dakkar.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/build-dakkar.sh b/build-dakkar.sh index cdd5c20b..7d69756f 100644 --- a/build-dakkar.sh +++ b/build-dakkar.sh @@ -81,21 +81,24 @@ function get_rom_type() { case "$1" in aosp80) mainrepo="https://android.googlesource.com/platform/manifest.git" - mainbranch="android-vts-8.0_r4" + ver=`git ls-remote --heads $mainrepo | grep -o 'android-vts-8.0_r.*' | grep -o '_r.*' | grep -o '[0-9]*' | sort -n | sed '$!d'` + mainbranch="android-vts-8.0_r$ver" localManifestBranch="master" treble_generate="" extra_make_options="" ;; aosp81) mainrepo="https://android.googlesource.com/platform/manifest.git" - mainbranch="android-8.1.0_r48" + ver=`git ls-remote --heads $mainrepo | grep -o 'android-8.1.0_r.*' | grep -o '_r.*' | grep -o '[0-9]*' | sort -n | sed '$!d'` + mainbranch="android-8.1.0_r$ver" localManifestBranch="android-8.1" treble_generate="" extra_make_options="" ;; aosp90) mainrepo="https://android.googlesource.com/platform/manifest.git" - mainbranch="android-9.0.0_r21" + ver=`git ls-remote --heads $mainrepo | grep -o 'android-9.0.0_r.*' | grep -o '_r.*' | grep -o '[0-9]*' | sort -n | sed '$!d'` + mainbranch="android-9.0.0_r$ver" localManifestBranch="android-9.0" treble_generate="" extra_make_options=""