Commit Graph

77178 Commits

Author SHA1 Message Date
Treehugger Robot
70a4f078b6 Merge "Pass --makefile_list to rbc board configuration" am: a95befe008 am: 975d03f73d am: 4fc71bedb8 am: 9e643c59f9
Original change: https://android-review.googlesource.com/c/platform/build/+/1975866

Change-Id: I8baeab6d9859529bd4ce3a4055857c20b3712d84
2022-02-08 21:11:41 +00:00
Treehugger Robot
9e643c59f9 Merge "Pass --makefile_list to rbc board configuration" am: a95befe008 am: 975d03f73d am: 4fc71bedb8
Original change: https://android-review.googlesource.com/c/platform/build/+/1975866

Change-Id: I221cebcf3193e8c94556a64e0ac47ee90cb09426
2022-02-08 21:00:12 +00:00
Treehugger Robot
4fc71bedb8 Merge "Pass --makefile_list to rbc board configuration" am: a95befe008 am: 975d03f73d
Original change: https://android-review.googlesource.com/c/platform/build/+/1975866

Change-Id: I0edb0b0351855a5473f78a2e5d253002c5293fc6
2022-02-08 20:44:42 +00:00
Treehugger Robot
ac19dde301 [automerger skipped] Merge "Merge SQ1A.220205.002" am: ab26e67abc am: d29d4ea39c -s ours am: 6315b5dfbb -s ours am: 54861a84e1 -s ours
am skip reason: Merged-In Ifcc54fbdb18bb480e73c2f52ebefd968b52a1e27 with SHA-1 fdbbcabca3 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1975694

Change-Id: I3397c1a0613d7ed5c8282a3bbf7cd14518d0c27e
2022-02-08 20:42:05 +00:00
Treehugger Robot
975d03f73d Merge "Pass --makefile_list to rbc board configuration" am: a95befe008
Original change: https://android-review.googlesource.com/c/platform/build/+/1975866

Change-Id: Ic36c1a3a1ae4dfbd126d31adb8c6e908ccd5444e
2022-02-08 20:28:04 +00:00
Treehugger Robot
54861a84e1 [automerger skipped] Merge "Merge SQ1A.220205.002" am: ab26e67abc am: d29d4ea39c -s ours am: 6315b5dfbb -s ours
am skip reason: Merged-In Ifcc54fbdb18bb480e73c2f52ebefd968b52a1e27 with SHA-1 fdbbcabca3 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1975694

Change-Id: Icbf2535fc30f9b624619bad85105a2ff4b370e57
2022-02-08 20:15:28 +00:00
Treehugger Robot
a95befe008 Merge "Pass --makefile_list to rbc board configuration" 2022-02-08 20:06:45 +00:00
Akilesh Kailash
f72860ce18 Enable io_uring feature for virtual A/B OTA
snapuserd: Use io_uring READ/WRITE opcodes for snapshot merge.
Specifically, it is used only for readahead and ordered ops
code path.

    Snapshot merge perf:

    ===========================================================

    Incremental OTA of 300M between two git_master branches on Pixel 6:

    ===========================================================

    On Android S (with dm-snapshot): ~15 minutes:

    update_engine: [INFO:cleanup_previous_update_action.cc(330)] Merge finished with state MergeCompleted.
    update_engine: [INFO:cleanup_previous_update_action.cc(130)] Stopping/suspending/completing CleanupPreviousUpdateAction
    update_engine: [INFO:cleanup_previous_update_action.cc(501)] Reporting merge stats: MergeCompleted in 926508ms (resumed 0 times), using 0 bytes of COW image.

    ===========================================================

    On Android T (with io_uring: ~38 seconds):

    update_engine: [INFO:cleanup_previous_update_action.cc(330)] Merge finished with state MergeCompleted.
    update_engine: [INFO:cleanup_previous_update_action.cc(130)] Stopping/suspending/completing CleanupPreviousUpdateAction
    update_engine: [INFO:cleanup_previous_update_action.cc(501)] Reporting merge stats: MergeCompleted in 38868ms (resumed 0 times), using 0 bytes of COW image.

    ===========================================================

Bug: 202784286
Test: Full/Incremental OTA
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: Ia6efff32898cdc6b683ca49c233ef45e8cd732e7
2022-02-08 20:00:39 +00:00
Treehugger Robot
6315b5dfbb [automerger skipped] Merge "Merge SQ1A.220205.002" am: ab26e67abc am: d29d4ea39c -s ours
am skip reason: Merged-In Ifcc54fbdb18bb480e73c2f52ebefd968b52a1e27 with SHA-1 fdbbcabca3 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1975694

Change-Id: I30b8549e669b8a60737ea93393068599a396e40e
2022-02-08 19:44:41 +00:00
Treehugger Robot
d29d4ea39c Merge "Merge SQ1A.220205.002" am: ab26e67abc
Original change: https://android-review.googlesource.com/c/platform/build/+/1975694

Change-Id: Ia42acce006e4a24d66def976641573b36037f866
2022-02-08 19:12:25 +00:00
Treehugger Robot
ab26e67abc Merge "Merge SQ1A.220205.002" 2022-02-08 18:52:08 +00:00
Jooyung Han
1a7e955e50 Merge "A custom APEX signing tool with --signing_args" am: 3a61599999 am: 82f355046c am: 67e7bd664e am: fe4f1b5169
Original change: https://android-review.googlesource.com/c/platform/build/+/1974282

Change-Id: I946a3c8aba064f1bf1818e7ea3b0f125015f69f1
2022-02-08 12:32:55 +00:00
Anton Hansson
e06a82cfd9 Merge "Fix typos in telephony_vendor product makefile" am: de88a91b43 am: 62b51f2e36 am: b2c6919f26 am: b683a82220
Original change: https://android-review.googlesource.com/c/platform/build/+/1974425

Change-Id: I37405ffcb9fd236dd240409a74a85621df546581
2022-02-08 12:20:12 +00:00
Jooyung Han
fe4f1b5169 Merge "A custom APEX signing tool with --signing_args" am: 3a61599999 am: 82f355046c am: 67e7bd664e
Original change: https://android-review.googlesource.com/c/platform/build/+/1974282

Change-Id: I7e6ed2114e1710a25b6800fb6f6679794664d37b
2022-02-08 12:14:18 +00:00
Anton Hansson
b683a82220 Merge "Fix typos in telephony_vendor product makefile" am: de88a91b43 am: 62b51f2e36 am: b2c6919f26
Original change: https://android-review.googlesource.com/c/platform/build/+/1974425

Change-Id: I3a13dac1a0bee09a594e1327db2f1cee60ae75a2
2022-02-08 12:04:57 +00:00
Jooyung Han
67e7bd664e Merge "A custom APEX signing tool with --signing_args" am: 3a61599999 am: 82f355046c
Original change: https://android-review.googlesource.com/c/platform/build/+/1974282

Change-Id: I88afad53771e60d5dcb3d56e8c5df09ec4a22f0f
2022-02-08 11:54:23 +00:00
Anton Hansson
b2c6919f26 Merge "Fix typos in telephony_vendor product makefile" am: de88a91b43 am: 62b51f2e36
Original change: https://android-review.googlesource.com/c/platform/build/+/1974425

Change-Id: I06b34f8c59e9194538c3f4c66cd79fad9fa908d6
2022-02-08 11:47:27 +00:00
Jooyung Han
82f355046c Merge "A custom APEX signing tool with --signing_args" am: 3a61599999
Original change: https://android-review.googlesource.com/c/platform/build/+/1974282

Change-Id: If2f0faac03ddb91e584789e95dec715335cd276b
2022-02-08 11:41:47 +00:00
Jooyung Han
3a61599999 Merge "A custom APEX signing tool with --signing_args" 2022-02-08 11:23:24 +00:00
Anton Hansson
62b51f2e36 Merge "Fix typos in telephony_vendor product makefile" am: de88a91b43
Original change: https://android-review.googlesource.com/c/platform/build/+/1974425

Change-Id: I15d9841a798641fbf1f394d2cb9761ae5c19e5bf
2022-02-08 10:35:29 +00:00
Anton Hansson
de88a91b43 Merge "Fix typos in telephony_vendor product makefile" 2022-02-08 09:43:31 +00:00
Xin Li
849ad3ba72 Merge SQ1A.220205.002
Bug: 213904741
Merged-In: Ifcc54fbdb18bb480e73c2f52ebefd968b52a1e27
Change-Id: I880096a3272bb9ae5b95e7f9b507b464b5aec856
2022-02-07 23:16:55 -08:00
Treehugger Robot
77eb550bdd Merge "Update default system Proguard config rules" am: 2624cfa2dc am: d836e794d6 am: f1e502094c am: 12667b84f7
Original change: https://android-review.googlesource.com/c/platform/build/+/1975127

Change-Id: If7fbe13fe7e748f6d30316bc80209fa0c4e9351c
2022-02-08 06:18:02 +00:00
Pirama Arumuga Nainar
40d233fb60 Merge "Add GLOBAL_CLANG_EXTERNAL_CFLAGS_NO_OVERRIDE to third-party code" am: 9335286372 am: 1d88752712 am: 68f0520a1d am: 5b6a981a79
Original change: https://android-review.googlesource.com/c/platform/build/+/1973521

Change-Id: If1c7600c392ffb072ca4a4f73ce17c5579e5550d
2022-02-08 06:17:52 +00:00
Treehugger Robot
12667b84f7 Merge "Update default system Proguard config rules" am: 2624cfa2dc am: d836e794d6 am: f1e502094c
Original change: https://android-review.googlesource.com/c/platform/build/+/1975127

Change-Id: I59af4cc92a60a1f27361e8c300987cf11d06d4eb
2022-02-08 06:04:47 +00:00
Pirama Arumuga Nainar
5b6a981a79 Merge "Add GLOBAL_CLANG_EXTERNAL_CFLAGS_NO_OVERRIDE to third-party code" am: 9335286372 am: 1d88752712 am: 68f0520a1d
Original change: https://android-review.googlesource.com/c/platform/build/+/1973521

Change-Id: I2a99d9d64f05a6dd3dcf2dfd7288064acd80d014
2022-02-08 06:04:39 +00:00
Treehugger Robot
f1e502094c Merge "Update default system Proguard config rules" am: 2624cfa2dc am: d836e794d6
Original change: https://android-review.googlesource.com/c/platform/build/+/1975127

Change-Id: Icf938b594a4b48fb1ab6d32d224b566002b12dc7
2022-02-08 05:53:16 +00:00
Treehugger Robot
d836e794d6 Merge "Update default system Proguard config rules" am: 2624cfa2dc
Original change: https://android-review.googlesource.com/c/platform/build/+/1975127

Change-Id: Id53536d8000a6c2d04ad3c7a75c65662ef137c4d
2022-02-08 05:47:20 +00:00
Pirama Arumuga Nainar
68f0520a1d Merge "Add GLOBAL_CLANG_EXTERNAL_CFLAGS_NO_OVERRIDE to third-party code" am: 9335286372 am: 1d88752712
Original change: https://android-review.googlesource.com/c/platform/build/+/1973521

Change-Id: I4a2594fb1f00d05ca0123ad4511297e89baf2acf
2022-02-08 05:46:35 +00:00
Treehugger Robot
dbd92551b1 Merge "Update APK parser to be compatible with new signer output" am: c438d9aaca am: e1c3dd402c am: be0f59ef69 am: 6065b59220
Original change: https://android-review.googlesource.com/c/platform/build/+/1976047

Change-Id: Ib6dd736f0bba43e2ad8876cefb65d80ba7c10f12
2022-02-08 05:40:56 +00:00
Treehugger Robot
2624cfa2dc Merge "Update default system Proguard config rules" 2022-02-08 05:35:04 +00:00
Pirama Arumuga Nainar
1d88752712 Merge "Add GLOBAL_CLANG_EXTERNAL_CFLAGS_NO_OVERRIDE to third-party code" am: 9335286372
Original change: https://android-review.googlesource.com/c/platform/build/+/1973521

Change-Id: I110eea2accbff66026fdd98d53734859a6f57bee
2022-02-08 05:18:59 +00:00
Treehugger Robot
6065b59220 Merge "Update APK parser to be compatible with new signer output" am: c438d9aaca am: e1c3dd402c am: be0f59ef69
Original change: https://android-review.googlesource.com/c/platform/build/+/1976047

Change-Id: Ie32901d312695e284f52910d5d7327430097c946
2022-02-08 05:15:57 +00:00
Pirama Arumuga Nainar
9335286372 Merge "Add GLOBAL_CLANG_EXTERNAL_CFLAGS_NO_OVERRIDE to third-party code" 2022-02-08 05:01:59 +00:00
Treehugger Robot
be0f59ef69 Merge "Update APK parser to be compatible with new signer output" am: c438d9aaca am: e1c3dd402c
Original change: https://android-review.googlesource.com/c/platform/build/+/1976047

Change-Id: I9b22f73ba6ae1670e59411360a0e74140a74a1f9
2022-02-08 04:59:50 +00:00
Treehugger Robot
3eea1f7c08 Merge "Fix small misuse of pass" am: f6cd3a1ddd am: 2238917d48 am: ad058b477b am: ae4ff2fa35
Original change: https://android-review.googlesource.com/c/platform/build/+/1976046

Change-Id: I5442f4b89666958c4af8bdd326732e6ca7fe63a1
2022-02-08 04:59:15 +00:00
Treehugger Robot
e1c3dd402c Merge "Update APK parser to be compatible with new signer output" am: c438d9aaca
Original change: https://android-review.googlesource.com/c/platform/build/+/1976047

Change-Id: Ie32209d9d3d11cb4c48a9ed280edb570ada480cf
2022-02-08 04:43:46 +00:00
Treehugger Robot
ae4ff2fa35 Merge "Fix small misuse of pass" am: f6cd3a1ddd am: 2238917d48 am: ad058b477b
Original change: https://android-review.googlesource.com/c/platform/build/+/1976046

Change-Id: I2d84028f6bd5736400949ca05a8efc3d7b65d873
2022-02-08 04:41:01 +00:00
Treehugger Robot
c438d9aaca Merge "Update APK parser to be compatible with new signer output" 2022-02-08 04:25:02 +00:00
Treehugger Robot
ad058b477b Merge "Fix small misuse of pass" am: f6cd3a1ddd am: 2238917d48
Original change: https://android-review.googlesource.com/c/platform/build/+/1976046

Change-Id: Iac45f0044bce25e539a5288bb81a2e11afda9c97
2022-02-08 04:23:52 +00:00
Treehugger Robot
2238917d48 Merge "Fix small misuse of pass" am: f6cd3a1ddd
Original change: https://android-review.googlesource.com/c/platform/build/+/1976046

Change-Id: I90547726772363a853bc5206093cf1f23ec2f030
2022-02-08 04:01:27 +00:00
Treehugger Robot
f6cd3a1ddd Merge "Fix small misuse of pass" 2022-02-08 03:42:12 +00:00
Kelvin Zhang
846f285d55 Update APK parser to be compatible with new signer output
Test: th
Bug: 218304082
Change-Id: If79ffdb1e4cec192ef796a39dd0ed5b38bc430e0
2022-02-07 16:38:09 -08:00
Kelvin Zhang
9d021e996b Fix small misuse of pass
The intention is to skip current iteration of for loop, so 'continue'
should be used instead of 'pass'

Test: th
Change-Id: Ic955beeaef74100981b351e2e7807c7fde538783
2022-02-07 16:38:09 -08:00
Cole Faust
1bcdd24ad9 Pass --makefile_list to rbc board configuration
So that mk2rbc will just read from the file instead
of searching the source tree for makefiles.

Bug: 213508006
Test: m RBC_BOARD_CONFIG=1 nothing
Change-Id: I6b7e2aa000ad9861173c58cc06f6d49c9c11a0a7
2022-02-07 15:17:55 -08:00
Kelvin Zhang
aee09174c7 Merge "Store EROFS images uncompressed" am: 691f8b93c7 am: 828c68767e am: d5ab964e6b am: 59e5a9a114
Original change: https://android-review.googlesource.com/c/platform/build/+/1956494

Change-Id: I30657128360b0a1b3cfc014a49806ad56270a726
2022-02-07 22:08:06 +00:00
Kelvin Zhang
59e5a9a114 Merge "Store EROFS images uncompressed" am: 691f8b93c7 am: 828c68767e am: d5ab964e6b
Original change: https://android-review.googlesource.com/c/platform/build/+/1956494

Change-Id: I77669eba679c1c010b7402650748e47a3ccd0968
2022-02-07 21:48:34 +00:00
Kelvin Zhang
d5ab964e6b Merge "Store EROFS images uncompressed" am: 691f8b93c7 am: 828c68767e
Original change: https://android-review.googlesource.com/c/platform/build/+/1956494

Change-Id: I0adc01c3080f7aba94b48603fa2b1fe4f5212bc5
2022-02-07 21:33:22 +00:00
Presubmit Automerger Backend
3833d153e4 [automerger skipped] [automerge] Add a keys argument to tapas 2p: 5ff4380b5d am: 4dd821f386 -s ours
am skip reason: Merged-In I2161be9e15f99713e11d22901d6eb7ad3c420093 with SHA-1 7f49a67d0d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16804130

Change-Id: I20c7c85a733477f8ef90594c5d3a29fd77b47e3e
2022-02-07 21:32:48 +00:00
Kelvin Zhang
828c68767e Merge "Store EROFS images uncompressed" am: 691f8b93c7
Original change: https://android-review.googlesource.com/c/platform/build/+/1956494

Change-Id: I8736cc954ce7c9fdde596c55c52e38410d306fe1
2022-02-07 21:14:15 +00:00