diff options
| author | Andres Morales <anmorales@google.com> | 2015-05-08 15:00:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-08 15:00:14 +0000 |
| commit | d34c722c59b13c80f89cfdeaf45ff38a3a12a6c5 (patch) | |
| tree | 6c033dff4f2799f1090f589b262dba67cec8d661 | |
| parent | 507bfdfcd9b8398db3e7469c6a39ad9e1c5dfb93 (diff) | |
| parent | e892a3f328b2db667e5059b93d4f8757a72ef5fd (diff) | |
| download | system_core-d34c722c59b13c80f89cfdeaf45ff38a3a12a6c5.zip system_core-d34c722c59b13c80f89cfdeaf45ff38a3a12a6c5.tar.gz system_core-d34c722c59b13c80f89cfdeaf45ff38a3a12a6c5.tar.bz2 | |
Merge changes Iac33dbaa,I18fcd37d into mnc-dev
* changes:
pass in correct buffer to print_id
stop including rootdir build.prop
| -rw-r--r-- | init/property_service.cpp | 1 | ||||
| -rw-r--r-- | mkbootimg/mkbootimg.c | 2 |
2 files changed, 1 insertions, 2 deletions
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_persist_props(void) { 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(); 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 @@ int main(int argc, char **argv) } if (get_id) { - print_id(sha, sizeof(hdr.id)); + print_id((uint8_t *) hdr.id, sizeof(hdr.id)); } return 0; |