Commit graph

96414 commits

Author SHA1 Message Date
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
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
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
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
LaMont Jones
9ee098e25b Add 'origin' parameter to flag declarations
This will reduce toil on separating the build flags.

Bug: 330386250
Bug: 328495189
Test: manual
Change-Id: I819184738bd3603534bb5e54c4b6a3ecd0a81a90
2024-03-20 16:22:53 -07:00
Treehugger Robot
d5d876a9a9 Merge "Fix typo" into main 2024-03-20 23:21:15 +00:00
LaMont Jones
96377be2a2 Merge "Defer "no such release config" error" into main 2024-03-20 23:08:27 +00:00
Kelvin Zhang
0669b8eac2 Fix typo
Test: th
Bug: 329678555
Change-Id: I952c19f93484dad9e273afe1cd45a043a36a34ee
2024-03-20 13:58:15 -07:00
LaMont Jones
76452d8b40 Defer "no such release config" error
This allows product-specific release config maps to declare release
configs.

Bug: 328495189
Test: manual
Change-Id: I862f167062ee647af00a4ec7d4af2966c6be44a8
2024-03-20 12:24:21 -07:00
Gurpreet Singh
497f02d8c0 Merge "Add respective modules to the list of individually toggleable modules." into main 2024-03-20 17:55:43 +00:00
Treehugger Robot
64134135c7 Merge "aconfig: update pb file location" into main 2024-03-20 17:46:35 +00:00
Jag
c6e96a6e96 Add respective modules to the list of individually toggleable modules.
This is safe since GTS tests already exist to check for mandatory modules, which these modulea are a part of.

Test: packages/modules/common/build/mainline_modules_sdks.sh
Bug: 238203992
Ignore-AOSP-First: changes in topics with internal-first/internal-only projects.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e14f4862bb439a73214bef4d909e9bdf35de8e40)
Merged-In: Ica19b306bdbd67a86d2cf73478d0f886f782118c
Change-Id: Ica19b306bdbd67a86d2cf73478d0f886f782118c
2024-03-20 17:12:28 +00:00
Luca Farsi
7ecb46b314 Merge "Remove extra test targets from inside build script" into main 2024-03-20 17:00:01 +00:00
Dennis Shen
5e909adbc8 aconfig: update pb file location
We have moved the storage records metadata pb file to the boot dir.

Bug: b/321077378
Test: atest aconfig_storage_read_api.test
Change-Id: Ic5bd89052e311ec5b1993ba1779d49be8451caa2
2024-03-20 16:38:09 +00:00
Michael Merg
fdaf4cf995 Merge "Write ide_qeury results to stdout" into main 2024-03-20 14:56:53 +00:00
Michael Merg
d8880abbdf Write ide_qeury results to stdout
All other output will be written to stderr.

Change-Id: Iefbd8292bb136e4723d5c168e4508ae183585c7c
2024-03-20 11:06:17 +00:00
Luca Farsi
2dc1701741 Remove extra test targets from inside build script
Due to branch constraints, remove the extra targets defined inside the
build script and revert to having them be passed in via command line.

Test: ./build/make/ci/build_test_suites_x86_64-trunk_staging --target_product aosp_x86_64 --target_release trunk_staging --with_dexpreopt_boot_img_and_system_server_only <extra_targets>
Bug: 314171817
Change-Id: I89a82e969d294104f587d778ad319a41905320f8
2024-03-19 17:24:40 -07:00
Daniel Zheng
6d5a509efa Merge "create_brick_ota: fix nonetype bug" into main 2024-03-19 19:29:49 +00:00
Daniel Zheng
0b7a685573 create_brick_ota: fix nonetype bug
If devkeys are present, we don't need to specify a serialno. In this
case we should conditionally add serial no to our metadata

Test: create_brick_ota
Change-Id: I9c93aa0f9ec5752693a9ddde5b76be4c12d6fc3b
2024-03-19 12:29:13 -07:00
Luca Farsi
b0dfb70381 Merge "Change the build test suites script to be noop" into main 2024-03-19 00:25:03 +00:00
Luca Farsi
11767d5dca Change the build test suites script to be noop
In preparation of switching over the git_main test suites target to
using this script change it to a no-op first to insure there's no
initial impact.

Test: ./build/make/ci/build_test_suites-trunk_staging --target_product aosp_x86_64 --target_release trunk_staging --with_dexpreopt_boot_img_and_system_server_only
Bug: 314171817
Change-Id: I7afab933143e4b617866b1975b1cbc71107f5b2f
2024-03-18 14:19:01 -07:00
Treehugger Robot
afac5b33ac Merge "Allow duplicate release config maps and build flag declarations" into main 2024-03-18 15:30:29 +00:00
LaMont Jones
451abd6a06 Allow duplicate release config maps and build flag declarations
Only include a release_config_map.mk file the first time it appears in
the list.

If the flag declaration is identical to one already declared, do not
raise an error.

This eases the process of migrating where flags are declared.

Bug: b/328781415
Bug: b/328495189
Test: manual, TH
Change-Id: I18316e769438f62071723771762d6e89be98b813
Merged-In: I18316e769438f62071723771762d6e89be98b813
2024-03-18 07:43:04 -07:00
Kiyoung Kim
d826a2355d Merge "Remove reference to VNDK current APEX" into main 2024-03-18 11:40:52 +00:00
Kadir Çetinkaya
f6e76b6566 Merge "Make sure ninja keeps going after errors" into main 2024-03-18 07:36:16 +00:00
Kiyoung Kim
fec5986a8c Remove reference to VNDK current APEX
VNDK Current APEX is being removed because VNDK is deprecated with
202404 and VNDK current APEX is no more available. This change removes a
reference to the VNDK current APEX so it won't look for removed module.

Bug: 328994089
Test: AOSP CF build succeeded
Change-Id: Id3c65b1e9a403847f43d2fa344c832ae43c2051d
2024-03-18 15:36:10 +09:00
Treehugger Robot
9ba9e0a71e Merge "Move frameworks/base/Android.mk to build/core" into main 2024-03-18 03:21:47 +00:00
Jeongik Cha
784f2a899c Merge "Use soong modules for init.*.rc" into main 2024-03-18 01:25:16 +00:00
Treehugger Robot
7665dbccdb Merge "Disable WITHOUT_CHECK_API for SDK products" into main 2024-03-15 20:28:51 +00:00
Cole Faust
b5f63e65d7 Merge "Add staging dir stamp files for all partitions" into main 2024-03-15 17:34:26 +00:00