commit 5d2e7aa488e042d3a93eccd26b6f6045ea1d8676
author Hridya Valsaraju <hridya@google.com> Mon Jul 09 10:45:20 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jul 09 10:45:20 2018 -0700
tree eca7c0b7023be09515b2ac7a2725867f06963ead
parent 164097e751bdf9964a3da61b7876523064a8ceb8
parent 88c1fd649d1ad8276526d3ac8d8e1a6b4855d9ff

Add capability to compress dt overlays
am: 88c1fd649d

Change-Id: Ice49bd3b85547c284caaba16e0a2b030038e0fdf

tests/libufdt_verify/ufdt_test_overlay.cpp

diff --git a/tests/libufdt_verify/ufdt_test_overlay.cpp b/tests/libufdt_verify/ufdt_test_overlay.cpp
index 19d56e7..2554d9d 100644
--- a/tests/libufdt_verify/ufdt_test_overlay.cpp
+++ b/tests/libufdt_verify/ufdt_test_overlay.cpp
@@ -431,6 +431,12 @@
         goto fail;
     }
 
+    for (size_t i = 0; i < overlay_count; i++) {
+        if ((fdt_magic(overlay_arr[i]) != FDT_MAGIC) || !fdt_totalsize(overlay_arr[i])) {
+            dto_error("Corrupted or empty overlay\n");
+            goto fail;
+        }
+    }
     ufdt_node_pool_construct(&pool);
     final_tree = ufdt_from_fdt(final_fdt_header, final_fdt_size, &pool);
 

tests/verifyDTBO.sh

diff --git a/tests/verifyDTBO.sh b/tests/verifyDTBO.sh
index 7ba9fca..d1a4366 100755
--- a/tests/verifyDTBO.sh
+++ b/tests/verifyDTBO.sh
@@ -24,7 +24,7 @@
 adb pull /sys/firmware/fdt final_dt > /dev/null
 
 #decompile the DTBO image
-mkdtimg_path="${ANDROID_HOST_BIN_LOCATION}/mkdtimg"
+mkdtimg_path="${ANDROID_HOST_BIN_LOCATION}/mkdtboimg.py"
 $mkdtimg_path dump dtbo.img -b dumped_dtbo > /dev/null
 
 #Get the index of the overlay applied from the kernel command line