diff options
| author | Bowgo Tsai <bowgotsai@google.com> | 2019-05-23 02:13:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-23 02:13:26 +0000 |
| commit | b36b54cf796d722653ad9bea11284815a3f5eda5 (patch) | |
| tree | 05d19ed7b04e4be5445ff306f1bfcd5e825eecb3 | |
| parent | 8ef22b102ce2eaa5668adc2631ad24017777d610 (diff) | |
| parent | 3182ea132e917b197149fee74a7eeba5b6b5125d (diff) | |
| download | system_core-b36b54cf796d722653ad9bea11284815a3f5eda5.tar.gz system_core-b36b54cf796d722653ad9bea11284815a3f5eda5.tar.bz2 system_core-b36b54cf796d722653ad9bea11284815a3f5eda5.zip | |
Merge "Moving /odm/build.prop to /odm/etc/buid.prop" into qt-dev
| -rw-r--r-- | init/property_service.cpp | 8 | ||||
| -rw-r--r-- | libcutils/fs_config.cpp | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/init/property_service.cpp b/init/property_service.cpp index bca73c950..fce8d578f 100644 --- a/init/property_service.cpp +++ b/init/property_service.cpp @@ -883,8 +883,12 @@ void property_load_boot_defaults(bool load_debug_prop) { load_properties_from_file("/system/build.prop", nullptr, &properties); load_properties_from_file("/vendor/default.prop", nullptr, &properties); load_properties_from_file("/vendor/build.prop", nullptr, &properties); - load_properties_from_file("/odm/default.prop", nullptr, &properties); - load_properties_from_file("/odm/build.prop", nullptr, &properties); + if (SelinuxGetVendorAndroidVersion() >= __ANDROID_API_Q__) { + load_properties_from_file("/odm/etc/build.prop", nullptr, &properties); + } else { + load_properties_from_file("/odm/default.prop", nullptr, &properties); + load_properties_from_file("/odm/build.prop", nullptr, &properties); + } load_properties_from_file("/product/build.prop", nullptr, &properties); load_properties_from_file("/product_services/build.prop", nullptr, &properties); load_properties_from_file("/factory/factory.prop", "ro.*", &properties); diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp index 6217bc802..a5f4f0e55 100644 --- a/libcutils/fs_config.cpp +++ b/libcutils/fs_config.cpp @@ -159,8 +159,9 @@ static const struct fs_path_config android_files[] = { { 00750, AID_ROOT, AID_SHELL, 0, "data/nativetest64/*" }, { 00600, AID_ROOT, AID_ROOT, 0, "default.prop" }, // legacy { 00600, AID_ROOT, AID_ROOT, 0, "system/etc/prop.default" }, - { 00600, AID_ROOT, AID_ROOT, 0, "odm/build.prop" }, - { 00600, AID_ROOT, AID_ROOT, 0, "odm/default.prop" }, + { 00600, AID_ROOT, AID_ROOT, 0, "odm/build.prop" }, // legacy; only for P release + { 00600, AID_ROOT, AID_ROOT, 0, "odm/default.prop" }, // legacy; only for P release + { 00600, AID_ROOT, AID_ROOT, 0, "odm/etc/build.prop" }, { 00444, AID_ROOT, AID_ROOT, 0, odm_conf_dir + 1 }, { 00444, AID_ROOT, AID_ROOT, 0, odm_conf_file + 1 }, { 00444, AID_ROOT, AID_ROOT, 0, oem_conf_dir + 1 }, |