Treehugger Robot
61d7773abb
Merge "Revert "Add a check that the staging directories don't..."" into main am: 0968914e2c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2787170
Change-Id: Ic3071ef71113e160724b7039b3c0b503bfda094a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-13 06:16:30 +00:00
Treehugger Robot
0968914e2c
Merge "Revert "Add a check that the staging directories don't..."" into main
2023-10-13 05:32:56 +00:00
Cole Faust
be5e391055
Revert "Add a check that the staging directories don't..."
...
Revert submission 2773149-partition_file_list_check
Reason for revert: b/305103467, b/305103783, b/305103468
Reverted changes: /q/submissionid:2773149-partition_file_list_check
Change-Id: I2fab3b4d7d24af4488e777ad84e12e280c42dcc0
2023-10-13 02:51:10 +00:00
Treehugger Robot
5abf1b6c1f
Merge "Buildifier fixes for release_config.bzl" into main am: d64961ba70
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2787005
Change-Id: I5cba15822cdf5f79a3af039c7bffb5253ae94568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-12 22:49:21 +00:00
Treehugger Robot
d64961ba70
Merge "Buildifier fixes for release_config.bzl" into main
2023-10-12 22:20:37 +00:00
Treehugger Robot
e4b285a443
Merge "Add missing AB partitions to img.zip" into main am: f639b39465
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2784534
Change-Id: I4aa0de1c02903304a88d8eaed7603ed94715ad0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-12 21:23:49 +00:00
LaMont Jones
fff3ee0a24
Buildifier fixes for release_config.bzl
...
Bug: None
Test: presubmit
Change-Id: I599c317d7a983d6e5d57b3c3153e4786a2ad9314
2023-10-12 21:21:03 +00:00
Treehugger Robot
f639b39465
Merge "Add missing AB partitions to img.zip" into main
2023-10-12 20:57:19 +00:00
Treehugger Robot
f40afd580c
Merge "Skip stripping 16K GKI kernel modules" into main am: c187d5052b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2779729
Change-Id: If0e6509975e2fa3f99c0d4c7f351eb1da18e4dbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-12 19:13:47 +00:00
Treehugger Robot
c187d5052b
Merge "Skip stripping 16K GKI kernel modules" into main
2023-10-12 18:42:53 +00:00
Kelvin Zhang
d7924a5311
Add missing AB partitions to img.zip
...
Add all AB partitions to img.zip, so that we can verify integrity of a
build by running avbtool on img.zip .
Bug: 274923679
Test: img_from_target_files on a pixel build. Unzip the generated img
zip, run avbtool verify_image --follow_chain_partitions --image
vbmeta.img, make sure result is successful.
Change-Id: I7d586a6f2ad87d8ebf87b788947055339b1121a2
2023-10-12 10:31:44 -07:00
Kelvin Zhang
ad3c30528d
Skip stripping 16K GKI kernel modules
...
GKI kernel modules are required to be signed, but curretnly we strip all
16K kernel modules. Use SYSTEM_DLKM_MODULE_PATTERNS to determine which
modules are GKI, and skip stripping for these kernel modules.
Test: boot using 16K boot image
Bug: 303725887
Change-Id: I4cd71b39ceb75650d03744220ec4ddf4aeeda871
2023-10-12 10:31:44 -07:00
Cole Faust
392731880a
Merge "Add a check that the staging directories don't..." into main am: fe455d1c0c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2773149
Change-Id: I1954e5a1901d08965ec2fba3a3d2f50bbd94caa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-12 16:57:20 +00:00
Elliott Hughes
5fe88a90af
Merge "Microoptimize package name extraction." into main am: cf5b792e92
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2784389
Change-Id: If2c7e371ca4d642467041d5202001b101cdc7429
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-12 16:56:49 +00:00
Cole Faust
fe455d1c0c
Merge "Add a check that the staging directories don't..." into main
2023-10-12 16:33:12 +00:00
Elliott Hughes
cf5b792e92
Merge "Microoptimize package name extraction." into main
2023-10-12 16:20:27 +00:00
Treehugger Robot
fbbd42f172
Merge "APEX extraction rule mentions APEXes" into main am: 6db65332e1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2784034
Change-Id: I00de4b3f0c9e9e91c7a7c6951b74122f8c9b0d2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-12 13:38:15 +00:00
Treehugger Robot
6db65332e1
Merge "APEX extraction rule mentions APEXes" into main
2023-10-12 12:58:45 +00:00
Jooyung Han
737f6e5c18
APEX extraction rule mentions APEXes
...
so that it's triggered even when APEX list shrinks.
(-d explain will print "command line changed for ...")
To repro:
- Pick one VAPEX with vintf fragment.
- Copy the fragment to /vendor/etc/vintf/manifest (DEVICE_MANIFEST_FILE)
- `m check-vintf-all` should fail
- Remove the APEX from PRODUCT_PACKAGES
- `m check-vintf-all` should pass
Bug: 304769672
Test: m check-vintf-all
(see above)
Change-Id: Iae9da91105faebfb8a5127fbb02a414b9ffdca10
2023-10-12 10:39:58 +09:00
Cole Faust
80fad16d14
Add a check that the staging directories don't...
...
...contain extra files after an installclean.
Bug: 205632228
Test: m installclean && m
Change-Id: Ib021465d1089a21bc4f43306b1441348baf71f9c
2023-10-11 17:42:34 -07:00
Elliott Hughes
707142007b
Microoptimize package name extraction.
...
Since there's only one, and it appears early, we can stop when we find
it rather than trawl through megabytes of localized strings we don't
need to see.
Bug: https://github.com/onetrueawk/awk/issues/199#issuecomment-1756885708
Test: treehugger
Change-Id: If4d7c63da7df76c23fca417a4b727189f79e3ce6
2023-10-11 22:56:22 +00:00
Alex Buynytskyy
c2ddd0e944
Merge "Fix sepolicy finalization build error" into main am: 9ef1caabed
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2784031
Change-Id: I3636465be49ee3b5b643af6e967d39b918cc82b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-11 15:52:08 +00:00
Alex Buynytskyy
9ef1caabed
Merge "Fix sepolicy finalization build error" into main
2023-10-11 15:31:43 +00:00
Dennis Shen
e857396ef5
Merge "aconfig: add missing string header to template" into main am: 268e445503
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2783599
Change-Id: Ic55ee442ac9ddc47c0978356de03132ecf5bb1ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-11 14:14:59 +00:00
Dennis Shen
268e445503
Merge "aconfig: add missing string header to template" into main
2023-10-11 14:01:46 +00:00
Dennis Shen
da07fea741
aconfig: add missing string header to template
...
Bug: 304338314
Test: atest aconfig.test
Change-Id: I97e62ebd9df18d260fd272a8f63a004ba627de9b
2023-10-11 14:00:48 +00:00
Treehugger Robot
6df36db6b6
Merge "printflags: improve protobuf decode error message" into main am: dcbe60977c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2779288
Change-Id: I54f8e61be8e9cbc89587c1175db1697acd119dc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-11 13:59:03 +00:00
Inseob Kim
4b11cd1a1c
Fix sepolicy finalization build error
...
Bug: 304532197
Test: manually run finalization script
Change-Id: I29f62d7c703081302f1133e881e33fa2ff7d16bf
2023-10-11 22:57:58 +09:00
Treehugger Robot
dcbe60977c
Merge "printflags: improve protobuf decode error message" into main
2023-10-11 13:05:02 +00:00
Zhi Dou
59f91d6e7c
Merge "aconfig: add @UnsupportedAppUsage to methods in generated flags" into main am: 057a3dd429
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2777061
Change-Id: I92c7d78242b6e68bfa1cc70ed44885ad567071b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 23:30:34 +00:00
Zhi Dou
057a3dd429
Merge "aconfig: add @UnsupportedAppUsage to methods in generated flags" into main
2023-10-10 22:53:54 +00:00
Zhi Dou
22a90f4f10
aconfig: add @UnsupportedAppUsage to methods in generated flags
...
The java generated flags are marked as @hide which breaks CTS. To
unblock CTS test add @UnsupportedAppUsage to expose the methods.
Test: atest aconfig.test.flags
Bug: 301272559
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:64ad75f50ae96f9a8b57a9e8f88ae9a53d3c1044 )
Merged-In: I897573c054e70fc6e093869ba6d416c38f81e28f
Change-Id: I897573c054e70fc6e093869ba6d416c38f81e28f
2023-10-10 13:55:06 +00:00
Mårten Kongstad
6e61f84fd6
printflags: improve protobuf decode error message
...
Include the file path and first bytes of file in the error message in
case aconfig fails to parse one of the protobuf files.
Example output:
$ adb shell printflags
Error: failed to parse /vendor/etc/aconfig_flags.pb ([0a], 1 byte(s))
Caused by:
Unexpected EOF
Bug: 304278614
Test: atest printflags.test
Change-Id: I18ff88bd25d72dd477c4b11a32505e75884906ee
2023-10-10 10:12:29 +02:00
Kelvin Zhang
a17daca2d4
Merge "Run validation on user specified vabc_compression_param" into main am: e52ce13e82
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2779731
Change-Id: I7880ef365a51bb4744a205d442dc81d9f51718a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:32:21 +00:00
Kelvin Zhang
e52ce13e82
Merge "Run validation on user specified vabc_compression_param" into main
2023-10-09 23:47:37 +00:00
Kelvin Zhang
7d1b29bd5d
Run validation on user specified vabc_compression_param
...
During OTA generation, we check the vabc compression param specified by
target files, and override compression param to gz if the specified
compression method is unsupported. Run the same validation on
compression param passed by --vabc_compression_param as well.
Test: th
Change-Id: If855a2ee8c3c280c74efd5a67df229ab6c5709c5
2023-10-09 16:47:19 -07:00
Anton Hansson
dd11d060d7
Merge changes I66b09cd4,I1847ab2b into main am: a43c06e5d6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2778930
Change-Id: I514b0f8324ee03f118aa414e4bbe229917a38c02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-09 23:40:39 +00:00
Anton Hansson
a43c06e5d6
Merge changes I66b09cd4,I1847ab2b into main
...
* changes:
Configure bootclasspath for sdk product
Remove sdk_<arch> products
2023-10-09 23:10:01 +00:00
Treehugger Robot
bc07c0136e
Merge "Filter REL out of preview codenames." into main am: 6a6e7731be
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2775701
Change-Id: I9dc3d74d55866255a2afca94b5e87c8f6cd64460
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-09 21:10:06 +00:00
Treehugger Robot
6a6e7731be
Merge "Filter REL out of preview codenames." into main
2023-10-09 20:34:07 +00:00
Elliott Hughes
18b102d5c0
Merge "Have the sanitizers trap rather than abort." into main am: 14e0d156fb
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2777875
Change-Id: If9cb7b5aeddf5f2cf5e30798f9365e67897c5394
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-09 16:44:10 +00:00
Elliott Hughes
14e0d156fb
Merge "Have the sanitizers trap rather than abort." into main
2023-10-09 16:08:06 +00:00
Anton Hansson
dde748a831
Configure bootclasspath for sdk product
...
The SDK product is currently used to build the SDK sources, which
are the full sources of the bootclasspath. For this to work, the
bootclasspath needs to be configured correctly, so inherit that config.
In the future, it would probably make sense for the sources to be built
together with a device -- the emulator, at which point this config can
be removed.
Bug: 151360309
Test: lunch sdk; m sdk sdk_repo dist
Change-Id: I66b09cd42249c4d5b76f06478781a90108e006e4
2023-10-09 14:41:45 +00:00
Anton Hansson
228de7b72c
Remove sdk_<arch> products
...
The SDK is arch-agnostic, so does not need per-arch products.
Bug: 205008975
Test: presubmit
Change-Id: I1847ab2bae0d07793bdd043430f0e79b36edb384
2023-10-09 14:41:30 +00:00
Treehugger Robot
47744f6c99
Merge "makefile:strip generic ramdisk kernel modules in android build system." into main am: 02eadb873f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2775567
Change-Id: Ie6a276775c28c787705cb23417bf3536d5a63da4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-07 03:41:22 +00:00
Treehugger Robot
02eadb873f
Merge "makefile:strip generic ramdisk kernel modules in android build system." into main
2023-10-07 03:17:16 +00:00
Elliott Hughes
40f0c5cad3
Have the sanitizers trap rather than abort.
...
abort() seems friendlier, but in practice it puts a couple of irrelevant
libc.so frames on the top of the stack trace and clobbers all the
registers that might have helped remotely debug a sanitizer failure.
Let's switch to trapping directly in the sanitized code instead.
Bug: http://b/298741930
Test: treehugger
Change-Id: I4fca63cb42bfba16a934c1fa88b08697faf3be41
2023-10-06 22:34:36 +00:00
Alyssa Ketpreechasawat
8404655faf
Merge "Revert "Revert "Add RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE in config.""" into main am: 8028a4c59f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2777427
Change-Id: I78fe6332ad0f7f9f55b6b3b926d67b17c3e1dfaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-06 19:28:15 +00:00
Alyssa Ketpreechasawat
8028a4c59f
Merge "Revert "Revert "Add RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE in config.""" into main
2023-10-06 19:17:40 +00:00
Alyssa Ketpreechasawat
f67da95b8c
Merge "Revert "Added new framework-pdf jar inside MediaProvider module"" into main am: b89b3f6108
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2775631
Change-Id: I37416bb40cedf8affa593e147e6de16044f0309b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-06 12:10:01 +00:00