Use vendor/build.prop for reading bootloader and radio if api>=29

hashbang · Sep 10, 2019 · 70631ae · 70631ae
1 parent d76a7e7
commit 70631ae
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/scripts/generate-vendor.sh b/scripts/generate-vendor.sh
@@ -1139,8 +1139,13 @@ DEVICE=$(get_device_codename "$INPUT_DIR/system/build.prop")
 DEVICE_FAMILY="$(jqRawStrTop "device-family" "$CONFIG_FILE")"
 VENDOR=$(get_vendor "$INPUT_DIR/system/build.prop")
 VENDOR_DIR="$(jqRawStrTop "aosp-vendor-dir" "$CONFIG_FILE")"
-RADIO_VER=$(get_radio_ver "$INPUT_DIR/system/build.prop")
-BOOTLOADER_VER=$(get_bootloader_ver "$INPUT_DIR/system/build.prop")
+if [[ "$API_LEVEL" -ge 29 ]]; then
+  RADIO_VER=$(get_radio_ver "$INPUT_DIR/vendor/build.prop")
+  BOOTLOADER_VER=$(get_bootloader_ver "$INPUT_DIR/vendor/build.prop")
+else
+  RADIO_VER=$(get_radio_ver "$INPUT_DIR/system/build.prop")
+  BOOTLOADER_VER=$(get_bootloader_ver "$INPUT_DIR/system/build.prop")
+fi
 BUILD_ID=$(get_build_id "$INPUT_DIR/system/build.prop")
 if [[ "$EXTRA_IMGS_LIST" != "" ]]; then
   readarray -t EXTRA_IMGS < <(echo "$EXTRA_IMGS_LIST")