Commit Graph

89516 Commits

Author SHA1 Message Date
Android Build Coastguard Worker
5252efe653 Version bump to UP1A.230905.013.A1 [core/build_id.mk]
Change-Id: Ic4ad8b7d17af41afbc0a818b4c828cd032f3a9de
2023-08-03 02:09:00 +00:00
Android Build Coastguard Worker
360a0ae0ee Version bump to UP1A.230905.013 [core/build_id.mk]
Change-Id: Ibef8e42df50362418e25b00e9d2a14b743126bec
2023-08-03 01:48:09 +00:00
Treehugger Robot
f39e594799 Merge "Minify the sdk targets" into main am: 392398cd40
Original change: https://android-review.googlesource.com/c/platform/build/+/2690448

Change-Id: I497ce6419ef401968b50405e005799ccbe0e4dbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 00:12:09 +00:00
Treehugger Robot
392398cd40 Merge "Minify the sdk targets" into main 2023-08-02 23:31:35 +00:00
Cole Faust
92d921ce24 Minify the sdk targets
Previously, the "sdk" target was a minimal lunch target that only
included enough to build the sdk. But the "sdk_<arch>" targets
redirected to the "sdk_phone_<arch>" targets, which are much bigger
and capable of building a whole emulator.

Building the sdk on products that can build a whole device complicates
the rest of the build system (for example, it starts enforcing dexpropt
works)

Bug: 290798660
Test: m sdk dist sdk_repo device-tests platform_tests on sdk_x86_64-userdebug
Change-Id: I76f38cf19172a5f5fae423175d5e03670137a0df
2023-08-02 15:36:59 -07:00
Jason Wu
c28a6572ae Merge "Revise minSdkVersion to fix failed mainline_modules_bundles-userdebug" into main am: 8e1baff3d3
Original change: https://android-review.googlesource.com/c/platform/build/+/2686870

Change-Id: I84701209b8c72820c56d64fcec3d930c6f086f0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 22:00:26 +00:00
Jason Wu
8e1baff3d3 Merge "Revise minSdkVersion to fix failed mainline_modules_bundles-userdebug" into main 2023-08-02 21:15:25 +00:00
Wei Li
a4fb2d0bdc Merge "Fix the calculation of package verification code which should not include algorithm information." into main am: fb55377c4b
Original change: https://android-review.googlesource.com/c/platform/build/+/2688227

Change-Id: I9ef9a20dcde29f6873370a04fa6fa737892df181
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 20:32:02 +00:00
James Wu
c5e321a06e Revise minSdkVersion to fix failed mainline_modules_bundles-userdebug
Test: abtd tests
Bug: 293456031
Change-Id: I674c50690bd04b7e4867c4aceb31d5bdcb53be84
2023-08-02 19:25:58 +00:00
Wei Li
fb55377c4b Merge "Fix the calculation of package verification code which should not include algorithm information." into main 2023-08-02 19:10:52 +00:00
Pierre-Clément Tosi
4e1f71ff7e Makefile: Avoid packaging pvmfw.bin in /system
Test: TH # In particular, make sure that b/261393794 isn't back.
Bug: 294177504
Change-Id: I1111ffb4a9e130568375329500c97eb850c0bfa1
2023-08-02 11:40:29 +01:00
Treehugger Robot
3aad1523a7 Merge "Revert "Revert "Add system staging dir stamp file for bazel sand..."" into main am: 8cad379e98
Original change: https://android-review.googlesource.com/c/platform/build/+/2686910

Change-Id: I03200fefa15b397a3980b90acf54d5fa676346c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 04:46:46 +00:00
Treehugger Robot
8cad379e98 Merge "Revert "Revert "Add system staging dir stamp file for bazel sand..."" into main 2023-08-02 04:11:10 +00:00
Treehugger Robot
e3296281f9 Merge "Remove OPTIONS.host_tools" into main am: 092719a471
Original change: https://android-review.googlesource.com/c/platform/build/+/2688229

Change-Id: I0b32673a99a1104480e38168119e1a641c476fe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 02:49:42 +00:00
Treehugger Robot
092719a471 Merge "Remove OPTIONS.host_tools" into main 2023-08-02 01:52:27 +00:00
Cole Faust
6833d7d47a Remove OPTIONS.host_tools
It appears to be unused.

Test: Presubmits
Change-Id: Idd7f9dda996458b93da77c783a546cdb3d1e0047
2023-08-01 18:00:37 -07:00
Treehugger Robot
b38245f203 Merge "Add the option for custom_image to be AVB or NONAVB" into main am: d5474ac3da
Original change: https://android-review.googlesource.com/c/platform/build/+/2643431

Change-Id: I8dcf0278278556992d5ef1a3f2f3f10f63a771c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 20:13:23 +00:00
Treehugger Robot
d5474ac3da Merge "Add the option for custom_image to be AVB or NONAVB" into main 2023-08-01 19:08:06 +00:00
Treehugger Robot
efd7352ae0 Merge "Support generating secondary OTAs from directories" into main am: 8aeb450a98
Original change: https://android-review.googlesource.com/c/platform/build/+/2686869

Change-Id: Ie1d8b2fa1cef19c1f3857348a1616671cad27fe1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 18:53:34 +00:00
Treehugger Robot
507d4b4ead Merge "Adding an option to disable puffdiff" into main am: 7383a91737
Original change: https://android-review.googlesource.com/c/platform/build/+/2686868

Change-Id: I2d5ff0ace7d28bcccd2cab61c9b9ade3864339e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 18:52:57 +00:00
Treehugger Robot
8aeb450a98 Merge "Support generating secondary OTAs from directories" into main 2023-08-01 18:14:37 +00:00
Treehugger Robot
7383a91737 Merge "Adding an option to disable puffdiff" into main 2023-08-01 18:09:43 +00:00
Kelvin Zhang
5b9ca88501 Support generating secondary OTAs from directories
Test: ota_from_target_files --include_secondary
Change-Id: I1004defdb4fe601a6ec733a7ceb213de7d540174
2023-08-01 10:04:08 -07:00
Kelvin Zhang
456c6d9a67 Adding an option to disable puffdiff
This is handy for quick OTA generation during development.

Change-Id: I878f7cb3479d6338c04aca44d16e48e83270252c
2023-08-01 10:03:54 -07:00
Cole Faust
4ad906d6a4 Revert "Revert "Add system staging dir stamp file for bazel sand..."
Revert submission 2685589-revert-2651299-bazel_sandwich-TVXWOASJNU

Reason for revert: It was not the cause of b/293883239

Reverted changes: /q/submissionid:2685589-revert-2651299-bazel_sandwich-TVXWOASJNU

Change-Id: I98ca2be7490a4e38d35e4e640a0d027711b67030
2023-08-01 16:38:58 +00:00
Jooyung Han
713a5e79e1 Merge "Revert "Add system staging dir stamp file for bazel sandwich"" into main am: 068da3ef96
Original change: https://android-review.googlesource.com/c/platform/build/+/2685589

Change-Id: I7cd80c86d092f6803489b928f9b0777001d94a4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 07:23:21 +00:00
Jooyung Han
068da3ef96 Merge "Revert "Add system staging dir stamp file for bazel sandwich"" into main 2023-08-01 06:50:26 +00:00
Jooyung Han
f6a2234a54 Revert "Add system staging dir stamp file for bazel sandwich"
Revert submission 2651299-bazel_sandwich

Reason for revert: b/293883239, checking if this breaks the build.

Reverted changes: /q/submissionid:2651299-bazel_sandwich

Change-Id: I40661772148434adf5fbec9568b4c303ff7eaf1c
2023-08-01 05:15:28 +00:00
Android Build Coastguard Worker
c85667a77e [coastguard skipped] Merge sparse cherrypicks from sparse-10589763-L91700000962314517 into udc-release.
COASTGUARD_SKIP: I08282b324b41e4bc34b9b4976a27bdd2eff49168

Change-Id: I5d7c61e1e6d4f01481a68b75b77425fc86a47447
2023-08-01 01:33:30 +00:00
Android Build Coastguard Worker
8a9ae8cb7b Version bump to UP1A.230905.012.A1 [core/build_id.mk]
Change-Id: I08282b324b41e4bc34b9b4976a27bdd2eff49168
2023-08-01 01:25:22 +00:00
Android Build Coastguard Worker
dc3a78c5e3 Version bump to UP1A.230905.012 [core/build_id.mk]
Change-Id: Ie60a7eabec86ee2e1982c897042a56490cb02ca3
2023-08-01 01:10:09 +00:00
Treehugger Robot
f0ebc2f667 Merge "Add system staging dir stamp file for bazel sandwich" into main am: e88ddaecc9
Original change: https://android-review.googlesource.com/c/platform/build/+/2651320

Change-Id: I56ff990c05c99824cdea49922194ea04bc8e76d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-31 23:08:03 +00:00
Treehugger Robot
e88ddaecc9 Merge "Add system staging dir stamp file for bazel sandwich" into main 2023-07-31 23:00:55 +00:00
Wei Li
f99db9977c Fix the calculation of package verification code which should not include algorithm information.
Bug: 293304694
Test: atest --host sbom_data_test
Test: build/soong/tests/sbom_test.sh
Change-Id: I94ea42284a9a6b5cc787a3489bfa575aa7663282
2023-07-31 15:09:16 -07:00
Devin Moore
c33aec868b Let assemble_vintf create the output fragments
Instead of checking, then copying the fragments into the out directory,
we pass in the output file and let assemble_vintf create the output
file.

Test: m
Bug: 290265210
Change-Id: I65c2ee826de73b805b48dc95f20c2405250587f8
2023-07-31 16:10:59 +00:00
Android Build Coastguard Worker
50c175ab6c Version bump to UP1A.230905.011 [core/build_id.mk]
Change-Id: Ib2682f641e7cce37e89b74a5f34ef3db85c18732
2023-07-29 06:37:02 +00:00
Treehugger Robot
0e188d221f Merge "aconfig: require exactly one bug field" into main am: 9997fdbacf
Original change: https://android-review.googlesource.com/c/platform/build/+/2676955

Change-Id: I40f07f3616ce354d4b1d68765dc6f817fceb4471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 09:28:00 +00:00
Treehugger Robot
9997fdbacf Merge "aconfig: require exactly one bug field" into main 2023-07-28 07:14:42 +00:00
Android Build Coastguard Worker
5d4c5e1fa0 Version bump to UP1A.230905.010 [core/build_id.mk]
Change-Id: I4ae0fc88a8a1d95186d862f65978de127bfce917
2023-07-28 01:53:47 +00:00
Treehugger Robot
62e1afb314 Merge "aconfig: improve error messages" into main am: 4d37a829dd
Original change: https://android-review.googlesource.com/c/platform/build/+/2679175

Change-Id: I622ebc2750ffe84df3abc034a3919055d28482d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 19:08:54 +00:00
Treehugger Robot
14f9447481 Merge "Fix test failures in releasetools" into main am: 0c8b7efdcc
Original change: https://android-review.googlesource.com/c/platform/build/+/2673339

Change-Id: I605c3f9e468eb747d72421d70c676f4e1c5cd3ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 19:08:41 +00:00
Treehugger Robot
4d37a829dd Merge "aconfig: improve error messages" into main 2023-07-27 18:09:37 +00:00
Treehugger Robot
0c8b7efdcc Merge "Fix test failures in releasetools" into main 2023-07-27 18:07:47 +00:00
Cole Faust
82222146ee Add system staging dir stamp file for bazel sandwich
This stamp file is an alias to request that the system staging directory
be built. The bazel sandwich cannot know the full list of files in the
staging directory at analysis time, so it will just depend on this
instead, and then find all the files in the staging dir at execution
time.

Bug: 265127181
Test: m bazel_sandwich
Change-Id: Iee3dff4f77c9e7054b4e8297e5d96b4ef8bf1cbb
2023-07-27 10:14:36 -07:00
Juan Yescas
59d2fb49c7 Merge "16k: core: Check that TARGET_MAX_PAGE_SIZE_SUPPORTED is greater than 4096 only for ARM archs." into main am: e74d66b42f
Original change: https://android-review.googlesource.com/c/platform/build/+/2676499

Change-Id: I22d9c314fb105fee54015b4a7aa2c1ec83cefab2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 14:42:30 +00:00
Juan Yescas
e74d66b42f Merge "16k: core: Check that TARGET_MAX_PAGE_SIZE_SUPPORTED is greater than 4096 only for ARM archs." into main 2023-07-27 14:00:22 +00:00
Mårten Kongstad
cd414d4c2e aconfig: improve error messages
Propagate anyhow errors to main.rs and commands.rs to improve the error
message. As an example. instead of just "bad flag declaration: exactly
one bug required", aconfig will now print the following.

---- 8< ----
Error: failed to create cache

Caused by:
    0: failed to parse build/make/tools/aconfig/tests/test.aconfig
    1: bad flag declaration: missing description
---- >8 ----

Error messages can be improved further by including additional
information in the protos.rs error cases. This will be handled in a
follow-up CL.

Bug: 290300657
Test: manual: introduce error in an aconfig file and run `m all_aconfig_declarations`
Test: atest aconfig.test
Change-Id: Id278f4877e5794b95913ae8ba0ca3ee211293f38
2023-07-27 15:54:45 +02:00
Mårten Kongstad
6353c6c635 aconfig: require exactly one bug field
Some consumers of `aconfig dump` do not support multiple bugs. At the
same time, we want all flags to be associated with at least one bug.

Teach aconfig to require that the bug field in the flag_declaration and
parsed_flag proto messages appear exactly once.

This change could have been implemented as a change of `repeated` to
`optional` in the proto definition. However, the chosen approach, with a
runtime check, is easier to revert if we want to support multiple bugs
in the future.

Bug: 293156797
Test: m all_aconfig_declarations && printflags
Test: atest aconfig.test aconfig.test.java aconfig.test.cpp
Change-Id: Ib87dac68b392986a8daa64e56cd85477c92fbe83
2023-07-27 09:44:00 +02:00
Android Build Coastguard Worker
a2ab99263a Version bump to UP1A.230905.009 [core/build_id.mk]
Change-Id: I0da63b664d45f01f977ab45f47b32923f76dedd3
2023-07-27 01:42:45 +00:00
Juan Yescas
6196841f4d 16k: core: Check that TARGET_MAX_PAGE_SIZE_SUPPORTED is greater than 4096 only for ARM archs.
For arm archs, PRODUCT_MAX_PAGE_SIZE_SUPPORTED  values can be 4096, 16384, 65536.
For other archs, PRODUCT_MAX_PAGE_SIZE_SUPPORTED can only be 4096.

Note: The linker flag max-page-size is configured by PRODUCT_MAX_PAGE_SIZE_SUPPORTED flag.

Bug: 289419664

Test: source build/envsetup.sh
      lunch aosp_cf_x86_64_phone
      build/make/core/config.mk:448: error: TARGET_MAX_PAGE_SIZE_SUPPORTED=65536 is greater than 4096. Only supported in ARM arch.

      source build/envsetup.sh
      lunch aosp_raven_64-userdebug

Change-Id: I887d6f12835f1bea4c6b92d7d836440b8d3fd6a8
2023-07-27 00:13:50 +00:00