Snap for 8730993 from 07f9e5a55a568c1407db6f40ec133a8d33b51bdf to mainline-tzdata3-releaseaml_tz3_314012070aml_tz3_314012050aml_tz3_314012010aml_tz3_313110000aml_tz3_312511020aml_tz3_312511010aml_tz3_312410020aml_tz3_312410010android12-mainline-tzdata3-releaseaml_tz3_314012010

Change-Id: Id92ab4ecd4cd7c8c91409aa87a71987c4de575a1

7 files changed, 13 insertions, 10 deletions

diff --git a/OWNERS b/OWNERS
index f512bb3..906cba6 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,2 +1,3 @@
 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 71e888b..2554d9d 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 fragment node %s to target %s\n",
-                  ufdt_node_name(frag_node), ufdt_node_name(target_node));
+        dto_error("failed to verify overlay node %s to target %s\n",
+                  ufdt_node_name(overlay_node), ufdt_node_name(target_node));
         return OVERLAY_RESULT_VERIFY_FAIL;
     }
 
diff --git a/utils/src/Android.bp b/utils/src/Android.bp
index 997121b..03f4aa6 100644
--- a/utils/src/Android.bp
+++ b/utils/src/Android.bp
@@ -59,8 +59,12 @@ python_binary_host {
     main: "mkdtboimg.py",
     srcs: ["mkdtboimg.py"],
     version: {
-        py3: {
+        py2: {
             embedded_launcher: true,
+            enabled: true,
+        },
+        py3: {
+            enabled: false,
         },
     },
 }
diff --git a/utils/src/mkdtboimg.py b/utils/src/mkdtboimg.py
index 5eeb5ea..bc33e1f 100755
--- a/utils/src/mkdtboimg.py
+++ b/utils/src/mkdtboimg.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python3
+#! /usr/bin/env python
 # 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 b28e3cf..5ca2eb8 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 2681703..edaf280 100755
--- a/utils/tests/mkdtboimg_acpi_testdata.sh
+++ b/utils/tests/mkdtboimg_acpi_testdata.sh
@@ -12,7 +12,6 @@
 # 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 51db394..12c2f95 100755
--- a/utils/tests/mkdtboimg_testdata.sh
+++ b/utils/tests/mkdtboimg_testdata.sh
@@ -12,7 +12,6 @@
 # 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="