commit fcaeb07400f3a82493b8331b42878ed8d41cacda
author Andres Morales <anmorales@google.com> Fri May 08 15:00:13 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 08 15:00:14 2015 +0000
tree 6c033dff4f2799f1090f589b262dba67cec8d661
parent db47cba812cff41c8de04d4e6ec7b6720e55a8b2
parent 32bafc62f1fb0de295402e49858c7467ea1548c2

Merge changes Iac33dbaa,I18fcd37d into mnc-dev

* changes:
  pass in correct buffer to print_id
  stop including rootdir build.prop

init/property_service.cpp

diff --git a/init/property_service.cpp b/init/property_service.cpp
index 930ef82..526e8ac 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -509,7 +509,6 @@
 void load_all_props() {
     load_properties_from_file(PROP_PATH_SYSTEM_BUILD, NULL);
     load_properties_from_file(PROP_PATH_VENDOR_BUILD, NULL);
-    load_properties_from_file(PROP_PATH_BOOTIMAGE_BUILD, NULL);
     load_properties_from_file(PROP_PATH_FACTORY, "ro.*");
 
     load_override_properties();

mkbootimg/mkbootimg.c

diff --git a/mkbootimg/mkbootimg.c b/mkbootimg/mkbootimg.c
index 7930ee4..b6a2801 100644
--- a/mkbootimg/mkbootimg.c
+++ b/mkbootimg/mkbootimg.c
@@ -278,7 +278,7 @@
     }
 
     if (get_id) {
-        print_id(sha, sizeof(hdr.id));
+        print_id((uint8_t *) hdr.id, sizeof(hdr.id));
     }
 
     return 0;