Commit Graph

85286 Commits

Author SHA1 Message Date
Treehugger Robot
268959a55b Merge "Prevent evaluating configurable properties before the defaults mutator" into main am: 0bfceee178
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3268013

Change-Id: Ib77c5c0a30267e649f0c37bc131825890bee8b37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-14 00:19:52 +00:00
Treehugger Robot
0bfceee178 Merge "Prevent evaluating configurable properties before the defaults mutator" into main 2024-09-13 23:56:18 +00:00
Treehugger Robot
004b8fa8fe Merge "[Ravenwood] Support fonts files and data files" into main am: e372d287c0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3268351

Change-Id: I5e5ed7abbc0ae580f22add3bba37adb9c1c7067e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 23:44:23 +00:00
Treehugger Robot
e372d287c0 Merge "[Ravenwood] Support fonts files and data files" into main 2024-09-13 23:27:25 +00:00
Maciej Żenczykowski
482bad125d Merge "BPF: rename bpf_defaults to bpf_cc_defaults" into main am: d0ea163941
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3268011

Change-Id: Ic615724aca37eec54c4b9d79f1a2dac294ed9325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 22:50:19 +00:00
Maciej Żenczykowski
d0ea163941 Merge "BPF: rename bpf_defaults to bpf_cc_defaults" into main 2024-09-13 22:15:27 +00:00
Treehugger Robot
50d7d19f7b Merge "Add links to partner docs for presigned apks" into main am: ad6a20f3a1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3268012

Change-Id: I2fe7e1ff79bc978c4e2054e0d6cb71e59e1183ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 21:34:12 +00:00
Aditya Kumar
0427340d48 Merge "Disable -Wno-deprecated-dynamic-exception-spec until the warning is fixed in libc++abi header files" into main am: e5cb9c659b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3264777

Change-Id: Ieaf814cfb2c01210e8b260406bf50e32668796b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 21:33:12 +00:00
Treehugger Robot
ad6a20f3a1 Merge "Add links to partner docs for presigned apks" into main 2024-09-13 21:16:42 +00:00
Aditya Kumar
e5cb9c659b Merge "Disable -Wno-deprecated-dynamic-exception-spec until the warning is fixed in libc++abi header files" into main 2024-09-13 21:10:04 +00:00
John Wu
680cd73e1a [Ravenwood] Support fonts files and data files
Add support to include font files into ravenwood_libgroup. Also make ravenwood data property to accept paths instead of module name. 

Bug: 292141694
Flag: EXEMPT host side change only
Test: $ANDROID_BUILD_TOP/frameworks/base/ravenwood/scripts/run-ravenwood-tests.sh
Change-Id: Ida5ef0230d2cc59fa1209199168c6c35e4842fbd
2024-09-13 20:59:05 +00:00
Cole Faust
d706709bf0 Prevent evaluating configurable properties before the defaults mutator
So that we can change the configuration after the defaults mutator
has run.

Bug: 361816274
Test: Presubmits
Change-Id: I550088b2555d275a86b5dd4d57e85a9ece859233
2024-09-13 13:37:59 -07:00
Treehugger Robot
da8bc7929e Merge changes from topic "flag_application_manifest" into main am: c2ea958b3d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3260724

Change-Id: I9d6d4446ab53bad4a9bea493afd7a5bd9e653ec5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 20:11:51 +00:00
Treehugger Robot
c2ea958b3d Merge changes from topic "flag_application_manifest" into main
* changes:
  Support multiple <application> or <uses-sdk> elements in manifest_*.py
  Fix manifest_fixer.py warnings
2024-09-13 19:52:44 +00:00
Cole Faust
ce6ddd6e24 Add links to partner docs for presigned apks
So if a partner gets this error they can find the script and see
links to documentation.

Test: Presubmits
Change-Id: I50cbe4770e9619fb67a7a586fa6d2210c67d4650
2024-09-13 11:51:02 -07:00
Colin Cross
e1ab849b39 Support multiple <application> or <uses-sdk> elements in manifest_*.py
Manifests may now have multiple copies of elements if they are
disambiguated with android:featureFlag attributes.  Remove the
restrictions on duplicate elements from manifest_check.py and
manifest_fixer.py, and instead iterate over all matching elements.

Test: manifest_check_test.py, manifest_fixer_test.py
Bug: 365170653
Flag: EXEMPT bugfix
Change-Id: Ib577439d03a808a20a5fcc3e15a3117e0970d729
2024-09-13 11:20:21 -07:00
Treehugger Robot
49361b616a Merge "Fix reanalysis after full build" into main am: 05d9069051
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3266058

Change-Id: I5ed2922d4106fd3920e7ac22a5d6391e9752ea63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 18:00:09 +00:00
Neill Kapron
dfc02f81fc BPF: rename bpf_defaults to bpf_cc_defaults
With the addition of defaults to the bpf soong module (see aosp/3249485
), the name `bpf_defaults` will be used to define defaults for bpf
program compilation. While there are separate soong namespaces for
module types and module names, rename the existing bpf_defaults
cc_defaults to bpf_cc_defaults for clarity.

While we're at it, add -Wextra, and cleanup unnecessary cflags in
clauses which use bpf_cc_defaults.

Test: TH
Change-Id: Ib5f453ce33b13c698e8b91088bc59f8c6719c892
Signed-off-by: Neill Kapron <nkapron@google.com>
2024-09-13 17:55:12 +00:00
Treehugger Robot
05d9069051 Merge "Fix reanalysis after full build" into main 2024-09-13 17:41:24 +00:00
Treehugger Robot
909dcb45ed Merge "Add SOONG_DISABLE_CLIPPY environment variable" into main am: 24627096c1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3265483

Change-Id: Ic5e3829598b7f0a6ade7a9b9371dee804395098a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 06:12:47 +00:00
Colin Cross
893528a4c9 Fix reanalysis after full build
Blueprint bootstrap and Soong each create rules to install
blueprint_go_binary modules to the same location, but with different
command lines.  Binaries used during bootstrap are installed using
the bootstrap rule, but then get reinstalled during a full build via
the blueprint_tools phony that is a dependency of droid.  This
changes the command line used for the rule stored in .ninja_log,
and then on the next bootstrap ninja will rerun the binaries,
triggering reanalysis.

As a quick fix, don't create install rules for loadplugins and
soong_build.  A more permanent fix may be to move the bootstrap
installation to a different location, but that will require more
testing.

Bug: 366291149
Test: m blueprint_tools && m blueprint_tools
Flag; EXEMPT bugfix

Change-Id: Ib7f2910976f4b5e6add2128ce0b2a5d10445a53c
2024-09-12 23:08:16 -07:00
Treehugger Robot
24627096c1 Merge "Add SOONG_DISABLE_CLIPPY environment variable" into main 2024-09-13 05:49:00 +00:00
Jihoon Kang
c178376639 Merge "Find subdir aconfig_values from srcs" into main am: 437f87f0c7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3260766

Change-Id: Icc30f314fbf63e9e0638ee6624f365858619c8cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 04:11:39 +00:00
Jihoon Kang
437f87f0c7 Merge "Find subdir aconfig_values from srcs" into main 2024-09-13 03:56:32 +00:00
Treehugger Robot
9c90fc248a Merge "linker_config_src in filesystem may read filegroup" into main am: 6c10c36d0a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3260462

Change-Id: I00c06378254845a293b5ba3cabafe2e40e021cdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 02:37:06 +00:00
Treehugger Robot
6c10c36d0a Merge "linker_config_src in filesystem may read filegroup" into main 2024-09-13 02:19:03 +00:00
Dennis Shen
bf9c8f0613 Treat system_ext as system container am: 01efb83420
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3261301

Change-Id: Ic6c35f5e647e8693a852f8528ff5758f5ae8693e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 01:43:31 +00:00
Jihoon Kang
4fbee9af0b Find subdir aconfig_values from srcs
This change supports adding dependencies from the aconfig_value_set
module to the aconfig_values modules from `srcs`, which are the
paths to the Android.bp files where the aconfig_value modules are
defined.

Test: m nothing --no-skip-soong-tests
Bug: 365827715
Change-Id: Idd5f1d9c2625a6362dbaf3adba0a74406e3a9928
2024-09-12 23:48:19 +00:00
Dennis Shen
01efb83420 Treat system_ext as system container
Bug: b/365135457
Test: m
Change-Id: Ic8fd60c0e1045f190b6608931ca1d65a784026f0
2024-09-12 23:31:49 +00:00
Chris Wailes
abc17eac1a Add SOONG_DISABLE_CLIPPY environment variable
This environment variable will be used for testing the Rust toolchain
for correctness before updating the Android codebase to resolve new
lints.

Test: Introduce lint
Test: SOONG_DISABLE_CLIPPY=true m out/soong/.intermediates/frameworks/minikin/rust/libminikin_rust_ffi/android_arm_armv8-a_rlib_rlib-std/libminikin_rust_ffi.rlib.clippy
Change-Id: If7236c7f16a3e0a0b27a90577211549f2dc1a344
2024-09-12 15:37:34 -07:00
Treehugger Robot
fea92ff7d7 Merge "Allow multiple ninja implementations" into main am: d4771aa267
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3263500

Change-Id: Ifc23db90237421265b8a485b422ab4d9bf1884ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 22:28:24 +00:00
Treehugger Robot
d4771aa267 Merge "Allow multiple ninja implementations" into main 2024-09-12 22:09:58 +00:00
Treehugger Robot
9e67f9499a Merge "Don't evaluate the enabled property in a defaultable hook" into main am: c379ea0fd4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3264841

Change-Id: Ia9d10fa1fef3718c9aced086880b592c9a576f95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 20:35:56 +00:00
Treehugger Robot
c379ea0fd4 Merge "Don't evaluate the enabled property in a defaultable hook" into main 2024-09-12 20:15:20 +00:00
Aditya Kumar
2c6b4acb87 Disable -Wno-deprecated-dynamic-exception-spec until the warning is fixed in libc++abi header files
Test: mmma art/libnativeloader

Bug: b/366180429
Change-Id: Ie77f9dc674224044d5c7078db891f88e42a52a19
2024-09-12 20:15:07 +00:00
Spandan Das
c1ced44f0a Merge "Use -language-version 1.9 in the kotlinKythe build rule" into main am: a7b916b50c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3263501

Change-Id: I9c7e372bef7ee0eb33cf879eb666853e1c174fe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 20:07:39 +00:00
Spandan Das
a7b916b50c Merge "Use -language-version 1.9 in the kotlinKythe build rule" into main 2024-09-12 19:52:30 +00:00
LaMont Jones
ece626ccac Allow multiple ninja implementations
This permits easier testing and comparison between different ninja
implementations.

Bug: 362926979
Bug: 318434287
Test: manual
Change-Id: Ic058338d0a2fd8c988794a0781dcc93c0f4c03e3
2024-09-12 12:45:27 -07:00
Treehugger Robot
1db55e4c54 Merge "Fix a bug in the log directory cleanup logic." into main am: c5d2456d8b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3248133

Change-Id: I008c62706c5a1d428023aa6318e316e79c09fdd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 19:22:49 +00:00
Treehugger Robot
c5d2456d8b Merge "Fix a bug in the log directory cleanup logic." into main 2024-09-12 19:02:44 +00:00
Cole Faust
8eeae4bbbe Don't evaluate the enabled property in a defaultable hook
So that we can decide the configuration after defaults are evaluated.
Instead, pass the enabled property on to submodules.

Bug: 361816274
Test: m nothing --no-skip-soong-tests
Change-Id: I853d557ed022f7434287cea0a2a19e684b59e145
2024-09-12 11:51:04 -07:00
Spandan Das
d6663871c7 Merge changes from topic "kotlin_kythe" into main am: 6556d043bd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3255897

Change-Id: Ica236952d1e57705b8ae9a437d7b8df6843a4f9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 18:23:13 +00:00
Spandan Das
3d6c6d9c76 Use -language-version 1.9 in the kotlinKythe build rule
There are some instances of .kt code in android platform that are not
fully compatible with kotlinc > 2. To account for this version skew when
generating xrefs, implicitly add `-language-version 1.9` to the args in
the .kzip file. The main kotlinc build rules remain the same.

This value has been picked manually by running
`external/kotlinc/bin/kotlinc -version` at ToT

Bug: 265428637
Test: verified that `-language-version 1.9` is added to the build
command of the .kzip files
Test: ran the indexer locally on the .kzip of `PermissionController-lib`
(this android_library contains .kt code that does not compile with
verison >2)

Change-Id: Icfb72800404d83f63204de23a1ec34b40ee05847
2024-09-12 18:20:59 +00:00
Spandan Das
6556d043bd Merge changes from topic "kotlin_kythe" into main
* changes:
  Add kotlin kzips to build_kzip.bash
  Create .kzip files for kotlin translation units
2024-09-12 18:14:14 +00:00
Yaowen Mei
d9108d2d34 Fix a bug in the log directory cleanup logic.
This CL fix the bug that shouldCleanupRBELogsDir() never return true.

The way how shouldCleanupRBELogsDir() use to work is it will return true only if `RBE_proxy_log_dir` flag is not set.

But CI build always got this flag from gcl file, and developer build always got this flag set from ui/build/rbe.go (http://shortn/_K604iWNYkd). So there is never a case this shouldCleanupRBELogsDir() return true. That is to say, we never clean up
RBELogsDir by ourselves.

The reason why this is not a concern is that soong will automatically delete the out/soong/.temp folder every time when user run `m` or `lunch`, and the default RBELogsDir use to be `out/soong/.temp/rbe`. So soong is helping us to clean the logs before.


Previously, I merged this CL: https://r.android.com/3192211 to support running `lunch` in two terminals. In that CL, I moved the auto created RBELogsDir one level up to `out/soong/rbe`. This is causing a problem because RBELogsDir never get cleaned.

This CL will fix the shouldCleanupRBELogsDir() method, after this merged in, 1) if a user didn't set the `RBE_proxy_log_dir` flag, the logs in `out/soong/rbe` will be cleaned each time when running `m`, but `lunch` will not touch `out/soong/rbe`, so we still support running `lunch` in different terminals. 2) If user set `RBE_proxy_log_dir` flag to anything rather than `out/song/rbe`, the directory will not be cleaned by running `m`; 3) we have updated our doc everywhere that `out/soong/rbe` is re-client's default log dir, so I think it should be expected if user set `RBE_proxy_log_dir=out/soong/rbe`, then the logs will be deleted when next time `m` invoked, same as if they set `RBE_proxy_log_dir=out/soong/.temp/rbe` before.


Test: abtd run is green: http://shortn/_KqTvQelstP, local build with multiply lunch is not affected, and running m after a build can clean the out/soong/rbe directory.
Bug: 362798954
Change-Id: I38a7ad650fc59ad06716c5be7de6ecc61ead8eef
2024-09-12 18:08:06 +00:00
Treehugger Robot
9919167ca7 Merge "Introduce a util method PrettyConcat" into main am: 167230037c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3262082

Change-Id: Ida7dcfad9d75cf155a1e63112ead720246dc3ba3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 17:12:59 +00:00
Treehugger Robot
167230037c Merge "Introduce a util method PrettyConcat" into main 2024-09-12 17:10:11 +00:00
Treehugger Robot
64c9cd249a Merge "Wrap blueprint_go_binary and bootstrap_go_package into android.Modules" into main am: 82e99ce373
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3260639

Change-Id: Ica8a29fbf3b942bbba6cd764b92ce0661dc811b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 15:57:10 +00:00
Treehugger Robot
82e99ce373 Merge "Wrap blueprint_go_binary and bootstrap_go_package into android.Modules" into main 2024-09-12 15:46:51 +00:00
Charisee Chiw
e7057c9097 Merge "rustc-1.81.0 Build 12349086" into main am: 3cee551577
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3263182

Change-Id: Ifac1d6e5c5a0ba813d02fc467af162fe97c15133
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 15:45:58 +00:00