Bill Yi
1cbb3eb8c3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3df71337bb73a2c2fb5322ff67e34cb4247f2299
2021-02-11 14:26:54 +00:00
Treehugger Robot
75626f2cd3
Merge "Fix SnapshotManager instantiation." am: bc1165edbc
am: 88a0f6edaa
am: 36d5558ce0
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1576377
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib8ed0c1ff5d5cc4247cf06222a3465a38d1dc0a9
2021-02-08 23:32:22 +00:00
Treehugger Robot
36d5558ce0
Merge "Fix SnapshotManager instantiation." am: bc1165edbc
am: 88a0f6edaa
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1576377
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I855a29da1aad901cce0ec33d9456e3d593636ad2
2021-02-08 22:33:00 +00:00
Treehugger Robot
88a0f6edaa
Merge "Fix SnapshotManager instantiation." am: bc1165edbc
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1576377
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2edb114694d02699c3809285349eecf3d41e9df3
2021-02-08 22:13:54 +00:00
Bob Badour
186e8fd9f1
Merge "Fix license_type. Contains OFL" am: 50b96cdf73
am: f0e8422f95
am: dfcb6e56b7
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1573923
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I01a19d282a46c8ad0de1fd6be2bd3fc4520d6589
2021-02-08 22:10:40 +00:00
Bob Badour
dfcb6e56b7
Merge "Fix license_type. Contains OFL" am: 50b96cdf73
am: f0e8422f95
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1573923
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9b8196c294577ef117aabb3856c0ccabd413d3cb
2021-02-08 21:33:36 +00:00
Treehugger Robot
bc1165edbc
Merge "Fix SnapshotManager instantiation."
2021-02-08 21:30:11 +00:00
Bob Badour
f0e8422f95
Merge "Fix license_type. Contains OFL" am: 50b96cdf73
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1573923
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I66864084d3187ce37769be5849482828ad812e7f
2021-02-08 20:51:32 +00:00
Bob Badour
50b96cdf73
Merge "Fix license_type. Contains OFL"
2021-02-08 20:11:59 +00:00
David Anderson
ebce8e6306
Fix SnapshotManager instantiation.
...
New() should be used instead of NewForFirstStageMount().
Bug: 168258606
Test: data wipe with VABC merge in progress
Change-Id: Idf2b01a504b577766da303091721764242e99a69
2021-02-04 20:23:15 -08:00
Bob Badour
a74bba9e01
Fix license_type. Contains OFL
...
See: http://go/android-license-checking-v2-lsc
Test: m all
Bug: 151953481
Bug: 151177513
Bug: 67772237
Exempt-From-Owner-Approval: janitorial work
Change-Id: Iaa673cbfa9ad46b03e90c11cdebf935e892b53a7
2021-02-03 12:15:52 -08:00
Elliott Hughes
65664e18ed
Merge "minui: remove libadf since it is no longer supported" am: 0cd9a63603
am: fd8cccb318
am: 3e22ae9c84
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1556560
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8232f50681a72dba91c796195de22a507e8b5da4
2021-01-22 01:46:47 +00:00
Elliott Hughes
3e22ae9c84
Merge "minui: remove libadf since it is no longer supported" am: 0cd9a63603
am: fd8cccb318
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1556560
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6a85afd6082e40a003ceaadb9bca418af0fb0fb0
2021-01-22 01:22:12 +00:00
Elliott Hughes
fd8cccb318
Merge "minui: remove libadf since it is no longer supported" am: 0cd9a63603
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1556560
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie57d2e60bc14cae40f0f46b5f06ab62fd4b865da
2021-01-22 01:06:09 +00:00
Elliott Hughes
0cd9a63603
Merge "minui: remove libadf since it is no longer supported"
2021-01-22 00:43:29 +00:00
Marissa Wall
7429176260
minui: remove libadf since it is no longer supported
...
Libadf is being removed since there are no android common kernels
that support adf. Remove support from miniui.
Test: Compiles and boots
Bug: 150467766
Change-Id: Ic66ea7a012b0466810ddeb8f884150b50c8ae769
2021-01-21 14:05:21 -08:00
Bill Yi
a64241a906
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3ee2cf84c9
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/13373388
Change-Id: Ibcdf738ba35453c751bb0aa50114018b038eb0c8
2021-01-20 07:16:13 +00:00
Bill Yi
3ee2cf84c9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia1bfd6505fe7e2608801d9d1c0dc6f546dba20c7
2021-01-19 23:15:52 -08:00
Tianjie Xu
18cb010945
Merge "Don't build host binary for applypatch" am: e9d25da64d
am: ac1e0c338b
am: ae03e0601a
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1551265
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5b718595904117c76f1d047313bf2ae9e634694f
2021-01-15 06:08:10 +00:00
Tianjie Xu
ae03e0601a
Merge "Don't build host binary for applypatch" am: e9d25da64d
am: ac1e0c338b
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1551265
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iba288757bc32d66f544a3adcb72c80fd020609f0
2021-01-15 04:39:06 +00:00
Tianjie Xu
ac1e0c338b
Merge "Don't build host binary for applypatch" am: e9d25da64d
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1551265
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5d9f688d739df6b0fa5620d08f883fd88f675f10
2021-01-15 03:49:52 +00:00
Tianjie Xu
e9d25da64d
Merge "Don't build host binary for applypatch"
2021-01-15 03:07:53 +00:00
Tianjie
b810334a8d
Don't build host binary for applypatch
...
This solves the build failured on mac, and we don't really need a
host binary.
Test: mma
Change-Id: I55b74f411fb5385417d474b753c830c855db7794
2021-01-14 18:17:07 -08:00
Kelvin Zhang
164369e95d
Merge changes from topic "imgdiff" am: e7a060a91b
am: b2c7beb2b1
am: d425351e4f
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1548894
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1442ccda0368bedc35b882e45d19df58f179e0cf
2021-01-14 17:00:46 +00:00
Kelvin Zhang
7c9edd3c57
Switch imgdiff to use libz_stable am: 2f2749f213
am: 9997438c1c
am: 0d375c657a
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1548316
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I21c6444c0fd82ca66ca039be34cf7be1dfed6ab7
2021-01-14 17:00:45 +00:00
Kelvin Zhang
d425351e4f
Merge changes from topic "imgdiff" am: e7a060a91b
am: b2c7beb2b1
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1548894
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9aa6658475c11275e806d50b1e3f5a4e319b57dd
2021-01-14 16:02:35 +00:00
Kelvin Zhang
0d375c657a
Switch imgdiff to use libz_stable am: 2f2749f213
am: 9997438c1c
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1548316
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3b8c94c5257f895f97544611fe0f9fd7cf1821f9
2021-01-14 16:02:34 +00:00
Kelvin Zhang
b2c7beb2b1
Merge changes from topic "imgdiff" am: e7a060a91b
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1548894
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I05720babfa906eae2d54979e9de1e7fe4853a4c0
2021-01-14 15:40:25 +00:00
Kelvin Zhang
9997438c1c
Switch imgdiff to use libz_stable am: 2f2749f213
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1548316
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib0cffbe8dcaa73377be32a7bee448e8b748c7c9f
2021-01-14 15:40:20 +00:00
Kelvin Zhang
e7a060a91b
Merge changes from topic "imgdiff"
...
* changes:
Re-enable failed imgpatch tests
Switch imgdiff to use libz_stable
2021-01-14 15:04:34 +00:00
Kelvin Zhang
2f2749f213
Switch imgdiff to use libz_stable
...
libz contain platform dependent optimization flags, and sometimes that
cause reconstruction of blobs to fail. Use libz_stable instead
Bug: 177076632
Test: treehugger
Change-Id: I3a8c1591672537d1c754b2bc5b26f939dd80ed47
2021-01-13 10:10:15 -05:00
Kelvin Zhang
07ba4483a6
Re-enable failed imgpatch tests
...
Now we added a libz variant without the offending optimizations,
re-enable tests.
Test: treehugger
Bug: 177076632
Change-Id: I6969090b2cb4c059d952df7cc034d0ed1ac366b2
2021-01-13 10:10:15 -05:00
Treehugger Robot
ec47dc37b8
Merge "Disable failed imgpatch tests" am: 043ef5ff40
am: 8775469f76
am: a88a07d8b9
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1545084
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9b0bded4cdc31ada758dafc0318a0a9f4fc7ebf8
2021-01-12 22:30:39 +00:00
Treehugger Robot
a88a07d8b9
Merge "Disable failed imgpatch tests" am: 043ef5ff40
am: 8775469f76
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1545084
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5a790cdc5232241e30b2be656965b164c2ee24e2
2021-01-12 22:16:52 +00:00
Treehugger Robot
8775469f76
Merge "Disable failed imgpatch tests" am: 043ef5ff40
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1545084
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1e1d94b1d38571b2f38830ca6d927d186f4a4abf
2021-01-12 22:00:07 +00:00
Treehugger Robot
043ef5ff40
Merge "Disable failed imgpatch tests"
2021-01-12 21:00:45 +00:00
Kelvin Zhang
d77e7ea105
Disable failed imgpatch tests
...
For a proper solution, add a variant of libz which doesn't have platform
dependent optimizations, and make imgdiff use that version.
Test: treehugger
Bug: 177076632
Change-Id: Ia9e926c1adf22d351315eeec5ad1fabc3d48efd5
2021-01-12 14:45:29 -05:00
Bill Yi
020d24a2db
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6246c37677
-s ours am: 049745c912
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/13281532
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I571af5f4ddda398f2d75d10c14f81b813899cc2d
2021-01-02 22:53:34 +00:00
Bill Yi
049745c912
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6246c37677
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/13281532
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6551a7e630f7fd33d2083e939b503d3f52d8a4cc
2021-01-02 22:35:08 +00:00
Bill Yi
6246c37677
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8f30c3857becececb69b1b53f3d465d9b66517e5
2021-01-02 17:31:57 +00:00
Treehugger Robot
b388a9c9a4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b9e39a0828
-s ours am: 80c5961188
-s ours am: e05c66f526
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1539142
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib6bca9865c26ae2a84cfc755b6666dccaaaeb3c8
2021-01-02 04:47:42 +00:00
Bill Yi
efa4a484cf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eb46e67d6a
-s ours am: d0c151d204
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/13281525
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7c97390385f70ccb51b4f95db48d8997a11df0af
2021-01-02 04:47:11 +00:00
Treehugger Robot
e05c66f526
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b9e39a0828
-s ours am: 80c5961188
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1539142
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifd1e8832208ebd4286024cbb5327e333f808a702
2021-01-02 04:29:44 +00:00
Bill Yi
d0c151d204
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eb46e67d6a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/13281525
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib976f61f1facf40f30cca0f880f4e10d4c76f820
2021-01-02 04:29:18 +00:00
Treehugger Robot
80c5961188
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b9e39a0828
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1539142
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8bd5647fd9d78a4de1991d666d157a6e99416d5d
2021-01-02 03:47:03 +00:00
Treehugger Robot
b9e39a0828
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-01-02 03:21:43 +00:00
Bill Yi
eb46e67d6a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5e12a07edaf692cb0693f82a88f158a5879a9fdf
2021-01-01 10:00:19 -08:00
Bill Yi
28d73e04b5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iae7aeba0daf150b22c265e4924100d0564f4e8cd
2021-01-01 17:32:58 +00:00
TreeHugger Robot
79c6761ba0
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-12-31 18:29:38 +00:00
Bill Yi
8421cc3a64
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iff35bc473cc2f0600fae6afc5bf4951c7cc4fe23
2020-12-30 23:07:54 -08:00