Commit graph

96641 commits

Author SHA1 Message Date
Treehugger Robot
6c539c0d83 Merge "16k: core: Remove page size limitation for setting TARGET_NO_BIONIC_PAGE_SIZE_MACRO" into main 2024-03-27 20:14:54 +00:00
Charisee Chiw
2a9674af58 Merge "Update needed for Rust v1.77.0" into main 2024-03-27 19:53:54 +00:00
Charisee
58708f5d7b Update needed for Rust v1.77.0
error: this `let...else` may be rewritten with the `?` operator
   --> build/make/tools/aconfig/aconfig/src/commands.rs:320:5
    |
320 | /     let Some(package) = parsed_flags.first().map(|pf| pf.package()) else {
321 | |         return None;
322 | |     };
    | |______^ help: replace it with: `let package = parsed_flags.first().map(|pf| pf.package())?;`
    |
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#ques
tion_mark
    = note: `-D clippy::question-mark` implied by `-D warnings`
    = help: to override `-D warnings` add `#[allow(clippy::question_mark)]`

error: this `let...else` may be rewritten with the `?` operator
   --> build/make/tools/aconfig/aconfig/src/commands.rs:330:5
    |
330 | /     let Some(container) = parsed_flags.parsed_flag.first().map(|pf| pf.container()) else {
331 | |         return None;
332 | |     };
    | |______^ help: replace it with: `let container = parsed_flags.parsed_flag.first().map(|pf| pf.cont
ainer())?;`
    |
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#ques
tion_mark

error: aborting due to 2 previous errors


Bug: 330185853
Test: ./test_compiler.py --prebuilt-path dist/rust-dev.tar.xz  --target aosp_cf_x86_64_phone --image
Change-Id: I00e22fc75137e8bd6fe28a8c20f8a1c3bbe711fd
2024-03-27 19:53:24 +00:00
Luca Farsi
c2ba38a7c1 switch to using DIST_DIR env var for dist
the dist dir should not be passed in as an argument, it should be picked
up from the environment.

Test: ./build/make/ci/build_test_suites --target_product aosp_x86_64 --target_release trunk_staging --with_dexpreopt_boot_img_and_system_server_only
Bug: 314171817
Change-Id: I32c007677cf1d81bb7b263b5c69e5510bf8dccfe
2024-03-27 11:31:12 -07:00
Inseob Kim
06d22319d2 Revert^2 "Migrate buildinfo.sh script into Soong"
This reverts commit 54101665ee.

Reason for revert: Fixed build breakage

Bug: 322090587
Change-Id: I065a187bf5863cbb381b4f3308aae7b7200ffa6d
Test: compare build.prop before and after
Test: build multiple times and see build.prop isn't rebuilt
2024-03-27 05:19:56 +00:00
Yi-Yo Chiang
bb50888987 Merge "Copy build.prop[-<part>] to dist dir only if the corresponding partition image is being built" into main 2024-03-27 01:55:51 +00:00
Treehugger Robot
65c865bd05 Merge "Dedupe input for target-native-copy-pairs" into main 2024-03-27 01:25:08 +00:00
Treehugger Robot
6f88286f46 Merge "Allow installing fake [odm|product|system_ext] packages" into main 2024-03-26 23:59:48 +00:00
Gina Ko
813b17dd5c Merge "Revert "Migrate buildinfo.sh script into Soong"" into main 2024-03-26 22:46:48 +00:00
Gina Ko
54101665ee Revert "Migrate buildinfo.sh script into Soong"
Revert submission 3004875-buildinfo_prop_soong

Reason for revert: DroidMonitor-triggered revert due to breakage b/331462869

Reverted changes: /q/submissionid:3004875-buildinfo_prop_soong

Bug: 331462869
Change-Id: I02b125f10aaba538998dfe3a503ed2021405e8ae
2024-03-26 22:45:44 +00:00
Lee Shombert
c3ce9e344c Merge "Export the sqlite build flag to more products" into main 2024-03-26 20:32:59 +00:00
Treehugger Robot
e1df94c841 Merge "releasetools: Resolve symlinks in IsEntryOtaPackage()" into main 2024-03-26 16:55:57 +00:00
Vilas Bhat
d3ad962cdc 16k: core: Remove page size limitation for setting TARGET_NO_BIONIC_PAGE_SIZE_MACRO
TARGET_NO_BIONIC_PAGE_SIZE_MACRO could be enabled regardless of the
value specified by TARGET_MAX_PAGE_SIZE_SUPPORTED and hence, the check
is no longer required.

Test: lunch <target> && get_build_var TARGET_NO_BIONIC_PAGE_SIZE_MACRO
Bug: 310232825

Change-Id: I4da314b803c4d84ac4ac1da691b9c195c2f2fb1d
2024-03-26 15:49:39 +00:00
Dennis Shen
8983991175 Merge "feed actual container name to storage file creation" into main 2024-03-26 12:25:03 +00:00
Dennis Shen
34a21cae25 feed actual container name to storage file creation
Bug: b/328491388
Test: m
Change-Id: I278cfc9b8e1818d67514fbf1682850aa297ae851
2024-03-26 12:24:55 +00:00
Inseob Kim
1e13e587f5 Merge "Migrate buildinfo.sh script into Soong" into main 2024-03-26 08:06:06 +00:00
yangbill
ee0a77ba3a Dedupe input for target-native-copy-pairs
$(ALL_MODULES.$(m).BUILT_INSTALLED) may have duplicated value which may
lead to `overriding commands for target` error.

Bug: 331135912
Test: m ltp
Test: m vts
Test: m vts_kernel_ltp_tests
Change-Id: Ia84ece733cb4062ea5ca1f2f702c145cd4df2a0b
2024-03-26 03:34:41 +00:00
Vilas Bhat
89fefda174 Merge "16k: core: Add defaults for TARGET_MAX_PAGE_SIZE_SUPPORTED" into main 2024-03-26 00:11:12 +00:00
Treehugger Robot
decb8f4d1b Merge "Add apk_name information in error message" into main 2024-03-25 22:30:31 +00:00
Spandan Das
198dcf91ca Add apk_name information in error message
Logging the apk_name will improve debugging process if
`GetMinSdkVersion` returns an exception.

Test: None
Change-Id: I3ddf602d92701dcaaa4821fe42a76a870a721a11
2024-03-25 21:24:33 +00:00
Vilas Bhat
d4e6add5b0 16k: core: Add defaults for TARGET_MAX_PAGE_SIZE_SUPPORTED
This refactors existing validation logic to do the following:
- Default ELF alignment to 4096 for non-(arm64/x86_64) targets.
- Default ELF alignment to 4096 if VSR_VENDOR_API_LEVEL < 34.

Test: lunch <target> && get_build_var TARGET_MAX_PAGE_SIZE_SUPPORTED
Bug: 310232825
Change-Id: Ia1548d74c9f92b70a80cb65cc6ed35d4c77edcd2
2024-03-25 18:11:39 +00:00
Yi-Yo Chiang
adaf1c6f11 Copy build.prop[-<part>] to dist dir only if the corresponding partition
image is being built

Bug: 330834204
Test: Build dist and check that build.prop is not copied if not building
  its partition
Change-Id: Iab08ef10e7c723867c2cf3ab4f297918dca989d3
2024-03-25 16:04:00 +08:00
Vilas Bhat
160357160b Merge "16k: core: Change default TARGET_MAX_PAGE_SIZE_SUPPORTED to 16384" into main 2024-03-25 02:02:09 +00:00
LuK1337
fc51de4553
releasetools: Resolve symlinks in IsEntryOtaPackage()
Test: Sign target files package where
      SYSTEM/product/media/bootanimation-dark.zip is a symlink to
      bootanimation.zip.
Change-Id: I4648c3c39c094cb090cbe337c566c3e9ad894691
2024-03-24 21:18:17 +01:00
Daniel Zheng
3903154c64 Merge "fallback to v2 on s build" into main 2024-03-22 20:45:55 +00:00
Vilas Bhat
8c85199efe 16k: core: Change default TARGET_MAX_PAGE_SIZE_SUPPORTED to 16384
Changing TARGET_MAX_PAGE_SIZE_SUPPORTED default from 65536 to 16384 as
this would reduce the ELF alignment for files and thereby also
decreasing the padding required. Although increased padding does not
result in increased disk space (due to holes), it increases file
metadata. Reducing ELF alignment also helps reduce page table memory as
it reduces number of memory pages utilized / virtual memory address
mappings.

Test: lunch <target> && get_build_var TARGET_MAX_PAGE_SIZE_SUPPORTED
Bug: 310232825
Change-Id: I7c6b1bb699fec8b8ecf49a0f06a79d89142e3a2b
2024-03-22 20:45:45 +00:00
Daniel Zheng
4a80c5403d fallback to v2 on s build
In the case that a vendor is on s build (which doesn't have snapuserd),
and is takinga  v3 -> v3 upgrade, we want to fallback to v2 vabc ota.

Test: th
Change-Id: Iba259b139b9b423ac77d82e14a113cf35fbfea64
2024-03-22 12:02:54 -07:00
Treehugger Robot
9339d8d98f Merge "Explicitly install optional components of perfetto" into main 2024-03-22 16:59:27 +00:00
Treehugger Robot
aa26ce4d75 Merge "envsetup.sh: work around zsh's built-in which." into main 2024-03-22 16:57:19 +00:00
Elliott Hughes
57c47b7055 envsetup.sh: work around zsh's built-in which.
Change-Id: I2583e7c2d7f27aa0d1b0e81601dc3b10e2404c89
2024-03-22 15:46:59 +00:00
Jiyong Park
b915495a9f Explicitly install optional components of perfetto
perfetto-extras is a phony module that abstracts optional components for
perfetto. Previously, the dependencies were installed by directly
required from traced_probes.

But that is expected to interfere with an upcoming change in Soong where
`required` dependencies are installed by Soong. Specifically, it will
increase the size of the `microdroid` module by 2-3MB because the
dependencies - which are unnecessary in Microdroid - will be installed
there due to the `required` being effective in Soong.

This change fixes that regression by making the dependencies to be only
for Android.

Bug: 321626681
Test: check the dependencies are found in Android
Test: check the dependencies are absent in Microdroid
Change-Id: I5871113e0fa6c6a9745e1c5d2e9d5c2f2dbd9764
2024-03-22 22:22:51 +09:00
Dennis Shen
12d3417708 Merge "aconfig: update aconfig_storage_read_api" into main 2024-03-22 12:49:04 +00:00
Ting-Hsin Chen
d14e178b79 Merge "Revert "Convert BuildIgnoreApexContritbutions variable to a boolean"" into main 2024-03-22 06:20:17 +00:00
Android Culprit Assistant
c7220c4877 Revert "Convert BuildIgnoreApexContritbutions variable to a boolean"
This revert was created by Android Culprit Assistant. The culprit was identified in the following culprit search session (http://go/aca-get/53721efb-c49e-4ce8-b96c-fd03598b4202).

Change-Id: Ifb82b8ec92b3ba8ad5da63ba497e4daad8093e4b
2024-03-22 06:15:54 +00:00
Spandan Das
4786d0ad3d Merge "Convert BuildIgnoreApexContritbutions variable to a boolean" into main 2024-03-22 02:32:45 +00:00
Lee Shombert
a64ebbdad3 Export the sqlite build flag to more products
sqlite is used in many products, including the Android system,
mainline modules, and sdks.  The trunk-stable build flag must be
exported to all of these targets.

Bug: 323176655

Change-Id: I23480610b710c0ec3e49c364c179ea76297fb494
2024-03-21 16:08:50 -07:00
Daniel Zheng
bd61eeecd7 Merge "Revert "allow command line override"" into main 2024-03-21 21:19:30 +00:00
Daniel Zheng
02393ee106 Revert "allow command line override"
This reverts commit f3d476ed40.

Reason for revert: b/330767621

Change-Id: Ia0b8ec3f177ae74c03d7cb4e568e44149b125617
2024-03-21 21:08:22 +00:00
Elliott Hughes
4e1a3498c1 Merge "envsetup.sh: explain _why_ there's an adb function in here." into main 2024-03-21 20:40:33 +00:00
Daniel Zheng
62ca754567 Merge "allow command line override" into main 2024-03-21 19:28:30 +00:00
Spandan Das
b20d060c3c Convert BuildIgnoreApexContritbutions variable to a boolean
The ignore list is burdensome to maintain once we start adding the
module sdk contents to apex_contributions. Convert the variable to a
boolean. When set to true, all contents in `apex_contributions` will be
ignored

Bug: 308187268
Test: m nothing on aosp,google and google_fullmte devices
Ignore-AOSP-first: CL topic does a cleanup of an internal only denylist

Change-Id: If899f6eaf5449c2aa789d0bd5b791a3db715c676
Merged-In: If899f6eaf5449c2aa789d0bd5b791a3db715c676
(cherry picked from commit 025492c4ea092b7f25a4d442e67143954b5ffaa5)
2024-03-21 18:04:25 +00:00
Daniel Zheng
f3d476ed40 allow command line override
Allow override for vabc_cow version if specified from the command line.
If OPTIONS.vabc_cow_version is already defined, then we don't want to
modify this value since it was defined by --vabc_compression_param=

Test: th
Change-Id: I57b8129faf5caf9de1dc8ad96e7570214a9f3313
2024-03-21 10:47:51 -07:00
Elliott Hughes
86e991710c envsetup.sh: explain _why_ there's an adb function in here.
This is what I came to do yesterday, but got distracted by the fact that it had been broken.

Change-Id: Ie3baf387c6c95a7302c1f6916c1557d486341cd8
2024-03-21 16:55:08 +00:00
Elliott Hughes
31a9fee831 Merge "Fix adb function." into main 2024-03-21 15:42:02 +00:00
Inseob Kim
6a35810856 Migrate buildinfo.sh script into Soong
To build system.img in Soong, we need all artifacts including
build.prop. This fully migrates buildinfo.prop file into Soong as a
first step to build build.prop on Soong.

Bug: 322090587
Test: compare build.prop before and after
Test: build multiple times and see build.prop isn't rebuilt
Change-Id: I0d5aab21a825cfe22f97a6834209f9df196625d9
2024-03-21 17:18:59 +09:00
Treehugger Robot
a0f30662d0 Merge "Remove BPTTOOL variable" into main 2024-03-21 02:15:56 +00:00
Dennis Shen
bb13bbb086 aconfig: update aconfig_storage_read_api
Previously we are ensuring that the public rust api to get mapped file
is safe as we are ensuring that the file being mapped has a permission
of 444. However, a file permission of 444 is not possible due to build
system needs to make file 644 while creating img files. Thus need to make the rust api to get mapped file unsafe.

In reality, this should have no impact. Because, even though the storage
files have a file permission of 644, they are on a RO partition like
system. So the files are not writable anyway. This is true for all the
containers (platform partitions and mainline modules) we know so far.

Bug: b/321077378
Test: atest aconfig_storage_read_api.test; atest
aconfig_storage_read_api.test.rust; atest
aconfig_storage_read_api.test.cpp

Change-Id: I643fe191e697a524e2303a32750f04c268f408fd
2024-03-21 01:44:02 +00:00
Cole Faust
d49454acab Remove BPTTOOL variable
This is unused since aosp/2654584

Test: Presubmits
Change-Id: Idf9b17d4d3b59f5a19ff544dd95d740892743303
2024-03-20 18:05:54 -07:00
Treehugger Robot
da552368e0 Merge "Add 'origin' parameter to flag declarations" into main 2024-03-21 00:50:36 +00:00
Elliott Hughes
7e7ff75042 Fix adb function.
It was broken by the last change (because unlike `which adb`, `command
adb` does not search $PATH if there's already an entry in the hash).
No-one's noticed in almost a year, but this has caused (rare) confusion
in the past.

Bug: http://b/24473359
Change-Id: I6bbb207992449132ba8563a8bcf298256c599c0d
2024-03-20 17:23:40 -07:00