Snap for 8474198 from 0734692e4dbe1f32d051360b3c8aa77f42932328 to tm-releaseandroid-vts-13.0_r1android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-13.0.0_r2android-platform-13.0.0_r1android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-release

Change-Id: I793454879198a915cf1642b979141c3ec9c30067

4 files changed, 4 insertions, 6 deletions

diff --git a/utils/src/Android.bp b/utils/src/Android.bp
index 03f4aa6..997121b 100644
--- a/utils/src/Android.bp
+++ b/utils/src/Android.bp
@@ -59,12 +59,8 @@ python_binary_host {
     main: "mkdtboimg.py",
     srcs: ["mkdtboimg.py"],
     version: {
-        py2: {
-            embedded_launcher: true,
-            enabled: true,
-        },
         py3: {
-            enabled: false,
+            embedded_launcher: true,
         },
     },
 }
diff --git a/utils/src/mkdtboimg.py b/utils/src/mkdtboimg.py
index bc33e1f..5eeb5ea 100755
--- a/utils/src/mkdtboimg.py
+++ b/utils/src/mkdtboimg.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 # Copyright 2017, The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/utils/tests/mkdtboimg_acpi_testdata.sh b/utils/tests/mkdtboimg_acpi_testdata.sh
index edaf280..2681703 100755
--- a/utils/tests/mkdtboimg_acpi_testdata.sh
+++ b/utils/tests/mkdtboimg_acpi_testdata.sh
@@ -12,6 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+set -e
 
 if ! hash iasl; then
     echo "Please install 'acpica-tools' first"
diff --git a/utils/tests/mkdtboimg_testdata.sh b/utils/tests/mkdtboimg_testdata.sh
index 12c2f95..51db394 100755
--- a/utils/tests/mkdtboimg_testdata.sh
+++ b/utils/tests/mkdtboimg_testdata.sh
@@ -12,6 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+set -e
 
 SRCDIR="data"
 DTS_LIST="