Commit graph

89566 commits

Author SHA1 Message Date
Yu Liu
db6eaacb6c [automerger skipped] Merge "Add device-tests as a dep of JACOCO_REPORT_CLASSES_ALL." into udc-dev am: c31092cbb0 am: 0b2d944d93 -s ours am: 16905fe755 -s ours
am skip reason: Merged-In Id201bda1bd4acfc6cadada982e20dee19d8c703a with SHA-1 affd00883f is already in history

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

Change-Id: I6471bee8a16b9bc69824e2490ec8682fc4c59835
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 23:18:48 +00:00
Yu Liu
16905fe755 [automerger skipped] Merge "Add device-tests as a dep of JACOCO_REPORT_CLASSES_ALL." into udc-dev am: c31092cbb0 am: 0b2d944d93 -s ours
am skip reason: Merged-In Id201bda1bd4acfc6cadada982e20dee19d8c703a with SHA-1 affd00883f is already in history

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

Change-Id: I87804d0aeb9ed52a884fb1734b6241f82c899775
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 22:33:16 +00:00
Yu Liu
0b2d944d93 Merge "Add device-tests as a dep of JACOCO_REPORT_CLASSES_ALL." into udc-dev am: c31092cbb0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24436725

Change-Id: I0d1ea3a8689cc3ae6c492a60f37ac76ee3644a47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 21:47:52 +00:00
Yu Liu
c31092cbb0 Merge "Add device-tests as a dep of JACOCO_REPORT_CLASSES_ALL." into udc-dev 2023-08-16 21:06:43 +00:00
Lokesh Kumar Goel
4f3b758b73 Update Security String to 2023-10-05 am: bb28383f49 am: f023196e6b am: fdd6257f85
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24426147

Change-Id: I1b55a17d456f19afac91f8a9ad4e6439b8843a6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 07:52:57 +00:00
Lokesh Kumar Goel
06d15e36b7 Update Security String to 2023-10-05 am: bb28383f49 am: 487c4be1db am: 2c70f79aa3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24426147

Change-Id: I5f84baf73b2df3598df9f9e86da7346e43871d42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 07:52:30 +00:00
Lokesh Kumar Goel
53dc60c990 Update Security String to 2023-10-05 am: bb28383f49 am: f023196e6b am: bf698e0a0f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24426147

Change-Id: I68b9629d2c1e14c502061cd39cd616cfdf39df9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 07:52:01 +00:00
Lokesh Kumar Goel
fdd6257f85 Update Security String to 2023-10-05 am: bb28383f49 am: f023196e6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24426147

Change-Id: Id22f3e9017b2deb24396368c1129f900932152e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 07:06:20 +00:00
Lokesh Kumar Goel
2c70f79aa3 Update Security String to 2023-10-05 am: bb28383f49 am: 487c4be1db
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24426147

Change-Id: Iac31707dbc271b7e32c600c37a67bbc80b605469
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 07:05:36 +00:00
Lokesh Kumar Goel
bf698e0a0f Update Security String to 2023-10-05 am: bb28383f49 am: f023196e6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24426147

Change-Id: Ia792feb312387361a8d0311892e5fc235a80b37d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 07:04:50 +00:00
Lokesh Kumar Goel
487c4be1db Update Security String to 2023-10-05 am: bb28383f49
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24426147

Change-Id: I721de32bb6fa18518e4a9683d96ff0214a7707be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 06:20:35 +00:00
Lokesh Kumar Goel
f023196e6b Update Security String to 2023-10-05 am: bb28383f49
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24426147

Change-Id: I2bf560d4b02603e7826c94b15f970bd989b82a09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 06:19:24 +00:00
Lokesh Kumar Goel
bb28383f49 Update Security String to 2023-10-05
Bug: 295937899
Change-Id: Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f
Ignore-AOSP-First: Internal first as its needed for preparing the release
2023-08-16 05:31:02 +00:00
Yu Liu
5101ccd905 Add device-tests as a dep of JACOCO_REPORT_CLASSES_ALL.
Bug: 289380707
Test: CI
(cherry picked from https://android-review.googlesource.com/q/commit:affd00883f33b86d1977ed69ca37fd7c5c36bf29)
Merged-In: Id201bda1bd4acfc6cadada982e20dee19d8c703a
Change-Id: Id201bda1bd4acfc6cadada982e20dee19d8c703a
2023-08-15 21:26:40 +00:00
Jared Duke
1dbcd3d0cc Merge "Add global rule for -keepattributes Exceptions" into main am: 7e730893f1 am: 69e90745fa am: b82c3b931c am: 1802f639a6
Original change: https://android-review.googlesource.com/c/platform/build/+/2707402

Change-Id: I7557f840a7efb42ac56b6afb868dd5074698b984
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15 21:22:19 +00:00
Jared Duke
1802f639a6 Merge "Add global rule for -keepattributes Exceptions" into main am: 7e730893f1 am: 69e90745fa am: b82c3b931c
Original change: https://android-review.googlesource.com/c/platform/build/+/2707402

Change-Id: I249b34cc3d9e766758149b9580e070f02c9258fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15 20:37:08 +00:00
Jared Duke
b82c3b931c Merge "Add global rule for -keepattributes Exceptions" into main am: 7e730893f1 am: 69e90745fa
Original change: https://android-review.googlesource.com/c/platform/build/+/2707402

Change-Id: I460753e1f89c7677e0f6bf1bf13536a317f54e66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15 19:55:19 +00:00
Jared Duke
69e90745fa Merge "Add global rule for -keepattributes Exceptions" into main am: 7e730893f1
Original change: https://android-review.googlesource.com/c/platform/build/+/2707402

Change-Id: I264c182195f468ffdd86dcdf0049336a08da4160
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15 18:33:18 +00:00
Jared Duke
7e730893f1 Merge "Add global rule for -keepattributes Exceptions" into main 2023-08-15 17:45:57 +00:00
Jared Duke
3f2741215f Add global rule for -keepattributes Exceptions
R8 full mode requires an explicit keep rule for keeping attributes for a
given target (class/method/member). As such, we can set the global rule
for keeping these attributes with minimal cost while reducing the
maintenance burden for adding incremental keep rules.

For a typical Android build, this adds <20KB total to the image.

Bug: 215530220
Test: m
Change-Id: Iad3de32e27da0ca93b618d8a203ee65bae0bb5d1
2023-08-15 15:48:35 +00:00
Ming-Chen Chung
7ff323cac2 Merge "Add update_device to be built and be packaged into otatools.zip." into main am: c2038e8e3d am: 08f1636468 am: 66c8c80579 am: 5271d604d4
Original change: https://android-review.googlesource.com/c/platform/build/+/2704353

Change-Id: Id81ee8f02f4b588059658c13478837092bda7ba2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15 05:09:27 +00:00
Ming-Chen Chung
5271d604d4 Merge "Add update_device to be built and be packaged into otatools.zip." into main am: c2038e8e3d am: 08f1636468 am: 66c8c80579
Original change: https://android-review.googlesource.com/c/platform/build/+/2704353

Change-Id: I2f16540645b0e6c27f897334b1283b78ccdcda6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15 04:22:40 +00:00
Ming-Chen Chung
66c8c80579 Merge "Add update_device to be built and be packaged into otatools.zip." into main am: c2038e8e3d am: 08f1636468
Original change: https://android-review.googlesource.com/c/platform/build/+/2704353

Change-Id: I642938b815aef19885076e38d4751b977708743d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15 03:39:19 +00:00
Cole Faust
cb545d4166 Merge "Rename some variables in definitions.mk" into main am: 26acac7287 am: 175b8f244d am: b5cdceb20b am: 4f8cd8cd28
Original change: https://android-review.googlesource.com/c/platform/build/+/2708513

Change-Id: I9c9be4140766b94da703a8cd3912561aa3198a48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15 03:15:49 +00:00
Ming-Chen Chung
08f1636468 Merge "Add update_device to be built and be packaged into otatools.zip." into main am: c2038e8e3d
Original change: https://android-review.googlesource.com/c/platform/build/+/2704353

Change-Id: I9d0cc91aa4827b4d50ccc49a29d355d86e95c4ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15 02:57:44 +00:00
Cole Faust
4f8cd8cd28 Merge "Rename some variables in definitions.mk" into main am: 26acac7287 am: 175b8f244d am: b5cdceb20b
Original change: https://android-review.googlesource.com/c/platform/build/+/2708513

Change-Id: I2316c952c437d5f27950655400042509327b7f6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15 02:31:05 +00:00
Ming-Chen Chung
c2038e8e3d Merge "Add update_device to be built and be packaged into otatools.zip." into main 2023-08-15 01:55:05 +00:00
Cole Faust
b5cdceb20b Merge "Rename some variables in definitions.mk" into main am: 26acac7287 am: 175b8f244d
Original change: https://android-review.googlesource.com/c/platform/build/+/2708513

Change-Id: I4a35ce4bdd7eef77e599f62836ff9bd9f14db3cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15 01:46:55 +00:00
Cole Faust
175b8f244d Merge "Rename some variables in definitions.mk" into main am: 26acac7287
Original change: https://android-review.googlesource.com/c/platform/build/+/2708513

Change-Id: Idfa2d255724d5b21e480e476aa3da6855713596e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15 01:06:15 +00:00
Cole Faust
26acac7287 Merge "Rename some variables in definitions.mk" into main 2023-08-15 00:30:15 +00:00
Joe Onorato
068eb0004f Merge "Give an error when trying to build "next" targets" into main am: 23a778b361 am: 773e746119 am: a1c5a31b6d am: b276317d89
Original change: https://android-review.googlesource.com/c/platform/build/+/2703313

Change-Id: Id1cc9a7b96e87b7340234b37b0236328d5ad5d7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 23:56:00 +00:00
Joe Onorato
b276317d89 Merge "Give an error when trying to build "next" targets" into main am: 23a778b361 am: 773e746119 am: a1c5a31b6d
Original change: https://android-review.googlesource.com/c/platform/build/+/2703313

Change-Id: Iffa0f057ae3218aa66829d453669604ee8b6b23b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 23:14:29 +00:00
Joe Onorato
a1c5a31b6d Merge "Give an error when trying to build "next" targets" into main am: 23a778b361 am: 773e746119
Original change: https://android-review.googlesource.com/c/platform/build/+/2703313

Change-Id: I65fa16e7210477652428a97c98d4f675c146f8c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 22:29:21 +00:00
Cole Faust
8e4024c872 Rename some variables in definitions.mk
Sublime text has an issue with their syntax highlighting, where it
looks for \s*define\b to indicate the start of a define block.
We had some variables that started with "define-", which match this
regex, which causes Sublime to be confused about where the defines
start and end. Rename the variables to work around this issue.

Test: m nothing
Change-Id: I997929606e2b0a8b086ad3b67a7ce1b5e99a7385
2023-08-14 15:28:05 -07:00
Joe Onorato
773e746119 Merge "Give an error when trying to build "next" targets" into main am: 23a778b361
Original change: https://android-review.googlesource.com/c/platform/build/+/2703313

Change-Id: Ib224b23c64038453e52456696c4e900453a00b9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 21:48:05 +00:00
Joe Onorato
23a778b361 Merge "Give an error when trying to build "next" targets" into main 2023-08-14 20:59:03 +00:00
Juan Yescas
22573e12d1 Merge "core: ARM 32-bit targets must be built with 4k elf alignment" into main am: dfa43734ac am: 6c8e80a8c2 am: b0b9264fc0 am: a6aadb25f5
Original change: https://android-review.googlesource.com/c/platform/build/+/2705856

Change-Id: I7e9007b58bf4836b5c62f8f6fe940b713082bbf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 19:42:55 +00:00
Treehugger Robot
6c0a5735a5 Merge "Makefile: Avoid packaging pvmfw.bin in /system" into main am: 66f7958fbf am: 3aca2727b8 am: a10ba13a27 am: 3de927e71c
Original change: https://android-review.googlesource.com/c/platform/build/+/2687888

Change-Id: Ic2755387e9fc3b63437b32a2b67812c9a994d053
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 19:40:52 +00:00
Juan Yescas
a6aadb25f5 Merge "core: ARM 32-bit targets must be built with 4k elf alignment" into main am: dfa43734ac am: 6c8e80a8c2 am: b0b9264fc0
Original change: https://android-review.googlesource.com/c/platform/build/+/2705856

Change-Id: I0eeca9e9b577b994853c5b7b01bf699d516a8bee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 19:39:30 +00:00
Treehugger Robot
3de927e71c Merge "Makefile: Avoid packaging pvmfw.bin in /system" into main am: 66f7958fbf am: 3aca2727b8 am: a10ba13a27
Original change: https://android-review.googlesource.com/c/platform/build/+/2687888

Change-Id: Ie2abd123675875ca73fd3232b32062ca900e8b54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 19:38:43 +00:00
Juan Yescas
b0b9264fc0 Merge "core: ARM 32-bit targets must be built with 4k elf alignment" into main am: dfa43734ac am: 6c8e80a8c2
Original change: https://android-review.googlesource.com/c/platform/build/+/2705856

Change-Id: I808abd042a1c2caed0ae8d166609b731a2b8ec77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 18:20:00 +00:00
Juan Yescas
6c8e80a8c2 Merge "core: ARM 32-bit targets must be built with 4k elf alignment" into main am: dfa43734ac
Original change: https://android-review.googlesource.com/c/platform/build/+/2705856

Change-Id: I21608557356122b16c4589c8bd4359e4df351562
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 17:59:39 +00:00
Juan Yescas
dfa43734ac Merge "core: ARM 32-bit targets must be built with 4k elf alignment" into main 2023-08-14 17:56:55 +00:00
Treehugger Robot
a10ba13a27 Merge "Makefile: Avoid packaging pvmfw.bin in /system" into main am: 66f7958fbf am: 3aca2727b8
Original change: https://android-review.googlesource.com/c/platform/build/+/2687888

Change-Id: Iad4131c9f820843157e9428c04e050c245144720
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 17:55:32 +00:00
Treehugger Robot
3aca2727b8 Merge "Makefile: Avoid packaging pvmfw.bin in /system" into main am: 66f7958fbf
Original change: https://android-review.googlesource.com/c/platform/build/+/2687888

Change-Id: Id01aedc47d59e056f98c51a2530dd5e6a177228c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 17:14:20 +00:00
Zhi Dou
4bccd69fd6 Merge "aconfig: add default-permission argument for create-cache command" into main am: 5f81b7dc96 am: 22419904dd am: 8ef7492eb0 am: 2cd99b9b2e
Original change: https://android-review.googlesource.com/c/platform/build/+/2704155

Change-Id: Ia0e708d812a5589bd9569ba8c690070b67535986
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 17:12:07 +00:00
Zhi Dou
2cd99b9b2e Merge "aconfig: add default-permission argument for create-cache command" into main am: 5f81b7dc96 am: 22419904dd am: 8ef7492eb0
Original change: https://android-review.googlesource.com/c/platform/build/+/2704155

Change-Id: I457bd140653065a3f615dfab72cc441cca2a38c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 16:26:56 +00:00
Treehugger Robot
66f7958fbf Merge "Makefile: Avoid packaging pvmfw.bin in /system" into main 2023-08-14 16:04:20 +00:00
Zhi Dou
8ef7492eb0 Merge "aconfig: add default-permission argument for create-cache command" into main am: 5f81b7dc96 am: 22419904dd
Original change: https://android-review.googlesource.com/c/platform/build/+/2704155

Change-Id: I9eea7a97f1d7643556ffc09017715230296f6267
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 15:38:55 +00:00
Zhi Dou
22419904dd Merge "aconfig: add default-permission argument for create-cache command" into main am: 5f81b7dc96
Original change: https://android-review.googlesource.com/c/platform/build/+/2704155

Change-Id: I02694c4afa2e208baddb9ba80d04297bccb7674a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 14:59:34 +00:00