Snap for 8570526 from 176be2e95dfd33b3ac02f896b168645bac0d3e60 to mainline-ipsec-releaseaml_ips_331910010aml_ips_331312000aml_ips_331310000aml_ips_331111030aml_ips_331014020android13-mainline-ipsec-release

Change-Id: I29956f3b4376cbdef2d9853bd668021bc4fd0659

7 files changed, 10 insertions, 13 deletions

diff --git a/OWNERS b/OWNERS
index 906cba6..f512bb3 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,3 +1,2 @@
 bowgotsai@google.com
-hridya@google.com
 szuweilin@google.com
diff --git a/tests/libufdt_verify/ufdt_test_overlay.cpp b/tests/libufdt_verify/ufdt_test_overlay.cpp
index 2554d9d..71e888b 100644
--- a/tests/libufdt_verify/ufdt_test_overlay.cpp
+++ b/tests/libufdt_verify/ufdt_test_overlay.cpp
@@ -280,8 +280,8 @@ static int ufdt_verify_fragment(struct ufdt *tree,
     bool result = ufdt_verify_overlay_node(target_node, overlay_node, tree, overlay_tree);
 
     if (!result) {
-        dto_error("failed to verify overlay node %s to target %s\n",
-                  ufdt_node_name(overlay_node), ufdt_node_name(target_node));
+        dto_error("failed to verify fragment node %s to target %s\n",
+                  ufdt_node_name(frag_node), ufdt_node_name(target_node));
         return OVERLAY_RESULT_VERIFY_FAIL;
     }
 
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/src/mkdtimg_dump.c b/utils/src/mkdtimg_dump.c
index 5ca2eb8..b28e3cf 100644
--- a/utils/src/mkdtimg_dump.c
+++ b/utils/src/mkdtimg_dump.c
@@ -89,19 +89,19 @@ static void free_fdt(void *fdt) {
 
 
 static void output_prop_int(FILE *out_fp, const char *name, uint32_t value) {
-  fprintf(out_fp, "%+20s = %d\n", name, fdt32_to_cpu(value));
+  fprintf(out_fp, "%20s = %d\n", name, fdt32_to_cpu(value));
 }
 
 static void output_prop_int_cpu(FILE *out_fp, const char *name, uint32_t value) {
-  fprintf(out_fp, "%+20s = %d\n", name, value);
+  fprintf(out_fp, "%20s = %d\n", name, value);
 }
 
 static void output_prop_hex(FILE *out_fp, const char *name, uint32_t value) {
-  fprintf(out_fp, "%+20s = %08x\n", name, fdt32_to_cpu(value));
+  fprintf(out_fp, "%20s = %08x\n", name, fdt32_to_cpu(value));
 }
 
 static void output_prop_str(FILE *out_fp, const char *name, const char *value) {
-  fprintf(out_fp, "%+20s = %s\n", name, value);
+  fprintf(out_fp, "%20s = %s\n", name, value);
 }
 
 static void output_table_header(FILE *out_fp, const struct dt_table_header *header) {
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="