Tianjie Xu
da58cc8699
[automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: e830a51351 skipped: 244aba4412 skipped: 9216bccd16 skipped: 98acdb9fce skipped: bc42a6b0eb am: 35332d7c62 am: 6b13f89f15 am: 274945cb5b -s ours am: 71b2447163
...
am: 70d41c5181 -s ours
Change-Id: I1882cd594c7708753f88ca0bad6e026ec1cc498a
2018-10-05 15:27:35 -07:00
Tianjie Xu
70d41c5181
[automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: e830a51351 skipped: 244aba4412 skipped: 9216bccd16 skipped: 98acdb9fce skipped: bc42a6b0eb am: 35332d7c62 am: 6b13f89f15 am: 274945cb5b -s ours
...
am: 71b2447163
Change-Id: I4c58e2c29d3d791f91bfd1aee91b5571d8fe9de9
2018-10-05 15:23:45 -07:00
Tianjie Xu
05e142c753
Merge "Compare the fingerprint before reading the partition" am: 81da8b12d2 am: 1cfe8098ba
...
am: 0f635dd33f
Change-Id: I63a8ef4992b0439f25f60fb3a700b08cd611fb08
2018-10-05 15:19:01 -07:00
Tianjie Xu
71b2447163
[automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: e830a51351 skipped: 244aba4412 skipped: 9216bccd16 skipped: 98acdb9fce skipped: bc42a6b0eb am: 35332d7c62 am: 6b13f89f15
...
am: 274945cb5b -s ours
Change-Id: Ic5569d0abf7674ca5bee1b3df01170e69b6a0c1d
2018-10-05 15:18:31 -07:00
Tianjie Xu
0f635dd33f
Merge "Compare the fingerprint before reading the partition" am: 81da8b12d2
...
am: 1cfe8098ba
Change-Id: Ic85d382111f5d2d5c80f55d71b477a2083a394d4
2018-10-05 15:13:57 -07:00
Tianjie Xu
274945cb5b
[automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: e830a51351 skipped: 244aba4412 skipped: 9216bccd16 skipped: 98acdb9fce skipped: bc42a6b0eb am: 35332d7c62
...
am: 6b13f89f15
Change-Id: Iecb9ede3a76664e15fc2b533b20571c8052ed4ba
2018-10-05 15:13:37 -07:00
Tianjie Xu
1cfe8098ba
Merge "Compare the fingerprint before reading the partition"
...
am: 81da8b12d2
Change-Id: I8a62d55b974ecfb0a3715459ed10e2c9fd6a2c75
2018-10-05 15:08:54 -07:00
Tianjie Xu
6b13f89f15
[automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: e830a51351 skipped: 244aba4412 skipped: 9216bccd16 skipped: 98acdb9fce skipped: bc42a6b0eb
...
am: 35332d7c62
Change-Id: I54660a0731148f1ebbe74d4412d333a9f956dcb1
2018-10-05 15:08:31 -07:00
Tianjie Xu
81da8b12d2
Merge "Compare the fingerprint before reading the partition"
2018-10-05 21:56:49 +00:00
Tianjie Xu
9eed65e1db
Compare the fingerprint before reading the partition
...
The update_verifier now compares the fingerprint of a partition before
performing the blocks read. If the fingerprint of the current system property
mismatches the one embedded in the care_map, verification of this partition
will be skipped. This is useful for the possible system only updates in the
future.
Bug: 114778109
Test: unit tests pass
Change-Id: Iea309148a05109b5810dfb533d94260d77ab8540
2018-10-04 16:42:57 -07:00
Jayant Chowdhary
7a9664fe4e
Merge "Reland: "recovery_test_component: Add libbinderthreadstate as static dependency."" am: f89067ab97 am: 6ab02efb27
...
am: 5fd33d7414
Change-Id: Iee9a4f6337c7997c958a082670d667eda96c22c9
2018-10-02 15:22:00 -07:00
Jayant Chowdhary
5fd33d7414
Merge "Reland: "recovery_test_component: Add libbinderthreadstate as static dependency."" am: f89067ab97
...
am: 6ab02efb27
Change-Id: I0c5c1539b98441c0d5d987d88670b686b146571b
2018-10-02 14:35:29 -07:00
Jayant Chowdhary
6ab02efb27
Merge "Reland: "recovery_test_component: Add libbinderthreadstate as static dependency.""
...
am: f89067ab97
Change-Id: I893141a2b491fb398ab1e2a6fd966401ab06cfd9
2018-10-02 13:56:35 -07:00
Jayant Chowdhary
f89067ab97
Merge "Reland: "recovery_test_component: Add libbinderthreadstate as static dependency.""
2018-10-02 20:14:37 +00:00
Christopher Ferris
452c16bb7f
Merge "Move to new isolation test runner." am: d87a79a947 am: e4f6fa690c
...
am: 652dcabe5a
Change-Id: Ia9f69775aa203cbd60af9117b97ca716c27638ee
2018-10-01 17:06:46 -07:00
Christopher Ferris
652dcabe5a
Merge "Move to new isolation test runner." am: d87a79a947
...
am: e4f6fa690c
Change-Id: Ic0180f9c7d069b606c8baa47c12c68369c7be48e
2018-10-01 16:51:20 -07:00
Christopher Ferris
e4f6fa690c
Merge "Move to new isolation test runner."
...
am: d87a79a947
Change-Id: Icdda931c0807d43fde1a6b7fa44a6af5306efeb9
2018-10-01 16:36:50 -07:00
Christopher Ferris
d87a79a947
Merge "Move to new isolation test runner."
2018-10-01 23:07:31 +00:00
Jayant Chowdhary
d24b054fa8
Reland: "recovery_test_component: Add libbinderthreadstate as static
...
dependency."
This reverts commit 26b86bb1dc .
Reason for revert: Dependencies which broke tests due to exclusion from
LOCAL_JNI_SHARED_LIBS have been added.
Change-Id: I364acfe8bd0526fb26f69cc29fb3545fc3e79764
2018-10-01 22:55:56 +00:00
Christopher Ferris
272467d950
Move to new isolation test runner.
...
Test: Ran tests.
Change-Id: I5fa99f7b6b03c7b9247b4f340f3df982063b0e3e
2018-10-01 12:19:33 -07:00
Remi NGUYEN VAN
9dd3fa8064
Merge "Revert "recovery_test_component: Add libbinderthreadstate as static dependency."" am: 968009cd5b am: 76eaa35201
...
am: 17762f01d1
Change-Id: Ide250a055d00d0b9e2f3786d1f737d5c61cb3cc8
2018-09-28 03:20:08 -07:00
Remi NGUYEN VAN
17762f01d1
Merge "Revert "recovery_test_component: Add libbinderthreadstate as static dependency."" am: 968009cd5b
...
am: 76eaa35201
Change-Id: I62bed901dde046bc807b436d4df85d31f11cd9e0
2018-09-28 03:11:54 -07:00
Remi NGUYEN VAN
76eaa35201
Merge "Revert "recovery_test_component: Add libbinderthreadstate as static dependency.""
...
am: 968009cd5b
Change-Id: Ia13095c45e217806326f6a44abf989ab09162f55
2018-09-28 02:59:01 -07:00
Remi NGUYEN VAN
968009cd5b
Merge "Revert "recovery_test_component: Add libbinderthreadstate as static dependency.""
2018-09-28 09:42:53 +00:00
Remi NGUYEN VAN
26b86bb1dc
Revert "recovery_test_component: Add libbinderthreadstate as static dependency."
...
This reverts commit a71c10b464 .
Reason for revert: This breaks framework tests and blocks presubmit
Change-Id: Iae94878889c1e71e2da5336fe75af88dfd3bfcfa
2018-09-28 07:51:13 +00:00
Jayant Chowdhary
7ae8950935
Merge "recovery_test_component: Add libbinderthreadstate as static dependency." am: 2dcbebf88f am: 20eb921f47
...
am: 927c8048a3
Change-Id: Ia5fe97749c11e42b41cff5cb98f501af04794bf5
2018-09-27 14:45:21 -07:00
Jayant Chowdhary
927c8048a3
Merge "recovery_test_component: Add libbinderthreadstate as static dependency." am: 2dcbebf88f
...
am: 20eb921f47
Change-Id: I74ba49651bbafd1810c3c5a3ddb70eb3a79a4dd2
2018-09-27 14:22:11 -07:00
Jayant Chowdhary
20eb921f47
Merge "recovery_test_component: Add libbinderthreadstate as static dependency."
...
am: 2dcbebf88f
Change-Id: Ifeff0896746981726a49117f1ad59a55dc064dc9
2018-09-27 14:14:37 -07:00
Jayant Chowdhary
2dcbebf88f
Merge "recovery_test_component: Add libbinderthreadstate as static dependency."
2018-09-27 21:02:35 +00:00
Tianjie Xu
991336d3fc
Merge "Enable fingerprint in care_map" am: f3d0e4783f am: 881f4225f2
...
am: 5dc4cde038
Change-Id: I327a2e711f2a810cdc6d9561cff1eb22f094869e
2018-09-27 11:01:50 -07:00
Tianjie Xu
5dc4cde038
Merge "Enable fingerprint in care_map" am: f3d0e4783f
...
am: 881f4225f2
Change-Id: I73b319d426896550e5ed037dd7f69de030ff2c46
2018-09-27 10:50:46 -07:00
Tianjie Xu
881f4225f2
Merge "Enable fingerprint in care_map"
...
am: f3d0e4783f
Change-Id: I9e15e8eb029b6da6142fd87318452a144f8c0a6a
2018-09-27 10:42:33 -07:00
Jayant Chowdhary
a71c10b464
recovery_test_component: Add libbinderthreadstate as static dependency.
...
Bug: 110364143
Bug: 114311116
Test: mm -j64
Change-Id: I3b9174443b00ad57be60881736afde7647351bd1
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com >
2018-09-27 10:36:57 -07:00
Tianjie Xu
f3d0e4783f
Merge "Enable fingerprint in care_map"
2018-09-27 17:32:33 +00:00
Tao Bao
d567f5d818
Merge "Allow OTA package size larger than 2GiB(2147483647 bytes) on sideload." am: b32bd8a333 am: f4bf630200
...
am: afafd332ee
Change-Id: I9dd73c473860e765b2ef52fae0b7dfbdbe65f47f
2018-09-27 10:14:41 -07:00
Tao Bao
afafd332ee
Merge "Allow OTA package size larger than 2GiB(2147483647 bytes) on sideload." am: b32bd8a333
...
am: f4bf630200
Change-Id: I7bf8b3f1d1947107d873e3efdc973c51ca120037
2018-09-27 10:04:50 -07:00
Tao Bao
f4bf630200
Merge "Allow OTA package size larger than 2GiB(2147483647 bytes) on sideload."
...
am: b32bd8a333
Change-Id: I69e31f6c34da79ca7ae3600b97941717ff3d48b6
2018-09-27 09:55:48 -07:00
Tao Bao
b32bd8a333
Merge "Allow OTA package size larger than 2GiB(2147483647 bytes) on sideload."
2018-09-27 16:34:13 +00:00
katao
77d6173714
Allow OTA package size larger than 2GiB(2147483647 bytes) on sideload.
...
At present, multiple partitions such as vendor have been added,
which reduces the coupling between mobile phone manufacturers
and Android systems. However, it may increase the generated
package size substantially (e.g. from ~200MB to ~800MB).
Causes the package size to exceed the int limit (2147483647 bytes).
Change the int length parameters to long.
Bug: http://b/112003354
Test: adb sideload ota.zip (ota.zip bigger than 2147483647 bytes)
Change-Id: Ifb656431f7b961ac0e91754107578dc8b89ff14e
Signed-off-by: katao <katao@xiaomi.com >
2018-09-27 16:34:01 +00:00
Tianjie Xu
f595a46735
Enable fingerprint in care_map
...
Enable the encoding and parsing of the property_id & partition
fingerprint by default; and add a flag "--no_fingerprint" to disable
the fingerprint generation/parsing to convert the legacy care_map.txt
Bug: 114778109
Test: run unittests in add_img_to_target_files
Change-Id: Id4216d5954e78c3a2d8e8bf19342109daf66a528
2018-09-26 20:14:53 -07:00
Hridya Valsaraju
ca7bf02d2e
Merge "Enter into userspace fastboot only if the device supports it" am: c2e6f0410c am: 4e30d0d687
...
am: ff47ab3ca4
Change-Id: Iacd90f207fcfeb6c7d47412cf41a7cdaf6507772
2018-09-24 13:27:16 -07:00
Hridya Valsaraju
ff47ab3ca4
Merge "Enter into userspace fastboot only if the device supports it" am: c2e6f0410c
...
am: 4e30d0d687
Change-Id: Ibc7f6627e6f4dc246158bd7d9c44e26af4243334
2018-09-24 13:15:06 -07:00
Hridya Valsaraju
4e30d0d687
Merge "Enter into userspace fastboot only if the device supports it"
...
am: c2e6f0410c
Change-Id: I503f02ce45b582018672e84e04311ec2bac88c82
2018-09-24 13:07:55 -07:00
Treehugger Robot
c2e6f0410c
Merge "Enter into userspace fastboot only if the device supports it"
2018-09-24 19:41:22 +00:00
Tianjie Xu
ae61f262e1
Merge "Refactor update_verifier into a class" am: ff29eb7f12 am: 4c65ab54c1
...
am: 68f9636e63
Change-Id: I084851d6806f82080c37a8ef97c984a039d42f04
2018-09-21 14:37:49 -07:00
Tianjie Xu
4ee7c4069b
Merge "Move the parse of last_install to recovery-persist" am: 6c8c7c1975 am: d671cc136f
...
am: 6c2e947671
Change-Id: If731a1264198398dc61c40425c5ca2d93396cbfb
2018-09-21 14:05:30 -07:00
Tianjie Xu
68f9636e63
Merge "Refactor update_verifier into a class" am: ff29eb7f12
...
am: 4c65ab54c1
Change-Id: I5c974112c6f6e23f7b550e786eb10fe42a217f7e
2018-09-20 23:16:16 -07:00
Tianjie Xu
6c2e947671
Merge "Move the parse of last_install to recovery-persist" am: 6c8c7c1975
...
am: d671cc136f
Change-Id: I3e351a7dd4b7462f0bbff556fcd6ef830ed37e63
2018-09-20 22:55:37 -07:00
Tianjie Xu
4c65ab54c1
Merge "Refactor update_verifier into a class"
...
am: ff29eb7f12
Change-Id: Ibecfa11ad96f9b34c1c9a0096f5096e798a18054
2018-09-20 22:54:57 -07:00
Tianjie Xu
d671cc136f
Merge "Move the parse of last_install to recovery-persist"
...
am: 6c8c7c1975
Change-Id: I4c5dc50ff2a3cfe6c7205aa48e27687166be337c
2018-09-20 22:31:51 -07:00