From 88712f7610c1c51ee9a58e17ad9f3e1b8425eba9 Mon Sep 17 00:00:00 2001 From: Zhomart Mukhamejanov Date: Tue, 21 Aug 2018 12:19:02 -0700 Subject: Move ab_streaming_metadata under ab_config. Add new config: ab_config.verify_payload_metadata. Change-Id: I521dff92166c33dd9c2efa498dc599fe4bc83fde Signed-off-by: Zhomart Mukhamejanov Test: mmm, junit Bug: 77150191 --- updater_sample/tests/res/raw/update_config_001_stream.json | 7 +++---- updater_sample/tests/res/raw/update_config_002_stream.json | 7 +++---- updater_sample/tests/res/raw/update_config_003_nonstream.json | 10 +++++++++- 3 files changed, 15 insertions(+), 9 deletions(-) (limited to 'updater_sample/tests/res') 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 be51b7c95..b024ad947 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 40c8fe1c1..12c18bb70 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 7c78b9d21..2011f76d9 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", -- cgit v1.2.3