commit 17f505e7ea06e665f68df3581bbfbb83e1e239df
author Tao Bao <tbao@google.com> Tue Oct 08 19:53:55 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 08 19:53:55 2019 +0000
tree 81309e6c77a1f684c563ea6e160fc7061adbb986
parent a8b633d181c99d0fccb9e21bcab67ff00ca4ae61
parent 3ed35d3d25b8e401e12913ed5506e29614dd9863

Merge "releasetools: Fix the support for getting reproducible images."

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index db86d92..f0c6b9b 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -524,7 +524,7 @@
             export TARGET_BUILD_VARIANT=$default_value
         elif (echo -n $ANSWER | grep -q -e "^[0-9][0-9]*$") ; then
             if [ "$ANSWER" -le "${#VARIANT_CHOICES[@]}" ] ; then
-                export TARGET_BUILD_VARIANT=${VARIANT_CHOICES[$(($ANSWER-1))]}
+                export TARGET_BUILD_VARIANT=${VARIANT_CHOICES[@]:$(($ANSWER-1)):1}
             fi
         else
             if check_variant $ANSWER
@@ -1295,10 +1295,10 @@
                 echo "Invalid choice"
                 continue
             fi
-            pathname=${lines[$(($choice-1))]}
+            pathname=${lines[@]:$(($choice-1)):1}
         done
     else
-        pathname=${lines[0]}
+        pathname=${lines[@]:0:1}
     fi
     \cd $T/$pathname
 }

target/product/gsi/current.txt

diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index aaa6621..6649f28 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -77,6 +77,7 @@
 VNDK-core: android.hardware.bluetooth.audio@2.0.so
 VNDK-core: android.hardware.bluetooth@1.0.so
 VNDK-core: android.hardware.boot@1.0.so
+VNDK-core: android.hardware.boot@1.1.so
 VNDK-core: android.hardware.broadcastradio@1.0.so
 VNDK-core: android.hardware.broadcastradio@1.1.so
 VNDK-core: android.hardware.broadcastradio@2.0.so