Move ab_streaming_metadata under ab_config.
Add new config: ab_config.verify_payload_metadata.
Change-Id: I521dff92166c33dd9c2efa498dc599fe4bc83fde
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
Test: mmm, junit
Bug: 77150191
diff --git a/updater_sample/tests/res/raw/update_config_001_stream.json b/updater_sample/tests/res/raw/update_config_001_stream.json
index be51b7c..b024ad9 100644
--- a/updater_sample/tests/res/raw/update_config_001_stream.json
+++ b/updater_sample/tests/res/raw/update_config_001_stream.json
@@ -2,7 +2,9 @@
"name": "streaming-001",
"url": "http://foo.bar/update.zip",
"ab_install_type": "STREAMING",
- "ab_streaming_metadata": {
+ "ab_config": {
+ "verify_payload_metadata": true,
+ "force_switch_slot": true,
"property_files": [
{
"filename": "payload.bin",
@@ -10,8 +12,5 @@
"size": 8
}
]
- },
- "ab_config": {
- "force_switch_slot": true
}
}
diff --git a/updater_sample/tests/res/raw/update_config_002_stream.json b/updater_sample/tests/res/raw/update_config_002_stream.json
index 40c8fe1..12c18bb 100644
--- a/updater_sample/tests/res/raw/update_config_002_stream.json
+++ b/updater_sample/tests/res/raw/update_config_002_stream.json
@@ -1,10 +1,8 @@
{
"__": "*** Generated using tools/gen_update_config.py ***",
"ab_config": {
- "force_switch_slot": false
- },
- "ab_install_type": "STREAMING",
- "ab_streaming_metadata": {
+ "verify_payload_metadata": true,
+ "force_switch_slot": false,
"property_files": [
{
"filename": "payload_metadata.bin",
@@ -38,6 +36,7 @@
}
]
},
+ "ab_install_type": "STREAMING",
"name": "S ota_002_package",
"url": "file:///data/my-sample-ota-builds-dir/ota_002_package.zip"
}
\ No newline at end of file
diff --git a/updater_sample/tests/res/raw/update_config_003_nonstream.json b/updater_sample/tests/res/raw/update_config_003_nonstream.json
index 7c78b9d..2011f76 100644
--- a/updater_sample/tests/res/raw/update_config_003_nonstream.json
+++ b/updater_sample/tests/res/raw/update_config_003_nonstream.json
@@ -1,7 +1,15 @@
{
"__": "*** Generated using tools/gen_update_config.py ***",
"ab_config": {
- "force_switch_slot": false
+ "verify_payload_metadata": true,
+ "force_switch_slot": false,
+ "property_files": [
+ {
+ "filename": "payload.bin",
+ "offset": 195,
+ "size": 8
+ }
+ ]
},
"ab_install_type": "NON_STREAMING",
"name": "S ota_002_package",