diff options
| author | Cole Faust <colefaust@google.com> | 2022-04-19 18:05:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-19 18:05:55 +0000 |
| commit | 0734692e4dbe1f32d051360b3c8aa77f42932328 (patch) | |
| tree | b1f618027e266cac259bc57aa7eed1cec649a628 | |
| parent | 2ac22bf55481977516bff3cd323e656ecd703e30 (diff) | |
| parent | ca262c4ba66172f612408c7760bcf2f52676d2a7 (diff) | |
| download | libufdt-android13-dev.tar.gz | |
Convert mkdtboimg.py to python 3 am: f20ea93eca am: 9cc2027ccc am: ca262c4ba6t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-vts-13.0_r2android-cts-13.0_r2android13-frc-odp-releaseandroid13-dev
Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2061124
Change-Id: I4e9a155dc46f747ae54d7785e85e8ac83b443d2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | utils/src/Android.bp | 6 | ||||
| -rwxr-xr-x | utils/src/mkdtboimg.py | 2 | ||||
| -rwxr-xr-x | utils/tests/mkdtboimg_acpi_testdata.sh | 1 | ||||
| -rwxr-xr-x | utils/tests/mkdtboimg_testdata.sh | 1 |
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=" |