commit 59f04b998212e4fbbc2ed77d70052f1175f1ca05
author Tao Bao <tbao@google.com> Tue Jun 14 16:09:16 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 14 16:09:16 2016 +0000
tree 113fbdc69c591f6c78d244cd898b39b2f14daa34
parent 4ddd5edf31908db841ae4974433189408e321d64
parent 9fb2b592e2dd8884cb5343cc0233ede3b7af8b29

Merge "Add bootloader_message_ab struct."

etc/META-INF/com/google/android/update-script

diff --git a/etc/META-INF/com/google/android/update-script b/etc/META-INF/com/google/android/update-script
deleted file mode 100644
index b091b19..0000000
--- a/etc/META-INF/com/google/android/update-script
+++ /dev/null
@@ -1,8 +0,0 @@
-assert compatible_with("0.1") == "true"
-assert file_contains("SYSTEM:build.prop", "ro.product.device=dream") == "true" || file_contains("SYSTEM:build.prop", "ro.build.product=dream") == "true"
-assert file_contains("RECOVERY:default.prop", "ro.product.device=dream") == "true" || file_contains("RECOVERY:default.prop", "ro.build.product=dream") == "true"
-assert getprop("ro.product.device") == "dream"
-format BOOT:
-format SYSTEM:
-copy_dir PACKAGE:system SYSTEM:
-write_raw_image PACKAGE:boot.img BOOT:

updater/install.cpp

diff --git a/updater/install.cpp b/updater/install.cpp
index bab2fe1..cfd6a97 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -1409,7 +1409,7 @@
     v->data = nullptr;
 
     FileContents fc;
-    if (LoadFileContents(filename, &fc) != 0) {
+    if (LoadFileContents(filename, &fc) == 0) {
         v->data = static_cast<char*>(malloc(fc.data.size()));
         if (v->data != nullptr) {
             memcpy(v->data, fc.data.data(), fc.data.size());