Commit Graph

66495 Commits

Author SHA1 Message Date
Liz Kammer
ae7094a51b Merge "Handle static binary repetition of system deps" into main am: 0a681989ae
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2613809

Change-Id: Ic0a8f1ce207e62e86c38c1b28a6b2798edd17c03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 14:49:10 +00:00
Liz Kammer
0a681989ae Merge "Handle static binary repetition of system deps" into main 2023-07-19 14:16:52 +00:00
Treehugger Robot
36e482d953 Merge "Add workaround for a file with an mtime in the future" into main am: b7c8d3d708
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2663376

Change-Id: I7f69014ad366928600a83627ddb4da1471d44da9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 05:31:13 +00:00
Treehugger Robot
4fc627b005 Merge "Install VNDK libraries into vendor or product lib with flag" into main am: 7d34640ac8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2648170

Change-Id: Ic68b28774fae655d638bb6b8b99a018f93d929b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 05:30:53 +00:00
Treehugger Robot
b7c8d3d708 Merge "Add workaround for a file with an mtime in the future" into main 2023-07-19 05:22:28 +00:00
Treehugger Robot
7d34640ac8 Merge "Install VNDK libraries into vendor or product lib with flag" into main 2023-07-19 04:44:51 +00:00
Yi Kong
b9062578e0 Merge "isCfi should query the mutated version" into main am: 7d8231d13e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2661935

Change-Id: Ia082324f20bae8876f461e364d12d074d5787158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 03:38:07 +00:00
Cory Barker
8e56654379 Merge "Add new options for defining paths to exclude in report gen" into main am: dba138a5b0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2663336

Change-Id: If51503113b764aeceb196a9fd0f2374d731044d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 03:37:46 +00:00
Yi Kong
7d8231d13e Merge "isCfi should query the mutated version" into main 2023-07-19 02:38:28 +00:00
Cole Faust
e9ae480a82 Add workaround for a file with an mtime in the future
Bug: 291828210
Test: `m` repeatedly, and see ninja say there's no work to do on the second run
Change-Id: I0e1e5a82ebd25e9eec5daea90eb72db0ac085f34
2023-07-18 19:36:41 -07:00
Cory Barker
dba138a5b0 Merge "Add new options for defining paths to exclude in report gen" into main 2023-07-19 02:31:14 +00:00
Prashanth Swaminathan
6dcbd9c239 Convert requested SDK version if preview API level
The 'sdk_version' flag should be allowed to specify a preview API level
codename. Convert the raw name into an integer using the common library
functions. This also switches out the comparison logic to use the
ApiLevel as defined by the 'android' library instead of doing
string-to-int conversion on the output.

Test: Verified that setting VIC as an sdk_version does not crash.
Change-Id: I6ed5fb7ff0dcfa3598e74faa656cde7fa2085bae
2023-07-18 17:55:01 -07:00
Yabin Cui
12b036576d Update rust bindgen to clang-r498229 am: 2850da608e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2663515

Change-Id: I39ecd8e33ae92f04201d7310ebeb84eb299ffc44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 00:33:28 +00:00
Cory Barker
2490757043 Add new options for defining paths to exclude in report gen
Test: built locally and verified results

Bug: 290337392
Change-Id: I382fe922e74d74b26ebbb2b477877b2a61015b87
2023-07-18 21:19:53 +00:00
Yabin Cui
2850da608e Update rust bindgen to clang-r498229
Bug: 280683256
Test: presubmit
Change-Id: I30c57035eaba408cdbaa4f1151ea2605fdd9d32b
2023-07-18 13:41:21 -07:00
Aditya Kumar
debaf2d204 Merge "Enable scs for riscv64" into main am: a4755647b0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2660940

Change-Id: I2052b0130d606b7eccc0ff5d40b5e049a56256b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 19:11:44 +00:00
Sam Delmerico
1717b3bb7a make android.InList generic
Change-Id: Ic166216cb473371a5e34cd97a068ca35f5534740
2023-07-18 15:07:24 -04:00
Jihoon Kang
258edea6f6 Merge "Fix stem to be propagated to output jar name in java_library" into main am: ef5d8278be
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2646424

Change-Id: I75ee4da6839d7c5e67f3eec9f9c5ed1e9bcf759a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 18:44:19 +00:00
Aditya Kumar
a4755647b0 Merge "Enable scs for riscv64" into main 2023-07-18 18:26:42 +00:00
Jihoon Kang
ef5d8278be Merge "Fix stem to be propagated to output jar name in java_library" into main 2023-07-18 18:26:36 +00:00
Cole Faust
b74818b55d Merge "Platform mapping-based product config" into main am: 66ef2ff97f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2629193

Change-Id: I77946b7c5f021f8ac821ab8d9cb6618580e906db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 17:32:39 +00:00
Cole Faust
66ef2ff97f Merge "Platform mapping-based product config" into main 2023-07-18 17:19:49 +00:00
Cole Faust
25cef3f958 Merge "Use rbc_dashboard.py instead of rbc_regression_test.sh" into main am: b3f571edd2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2660535

Change-Id: I4356c6841f38a29eb375b4641116beb53fd6807b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 16:48:43 +00:00
Cole Faust
b3f571edd2 Merge "Use rbc_dashboard.py instead of rbc_regression_test.sh" into main 2023-07-18 16:40:07 +00:00
Treehugger Robot
0c5f419b80 Merge "Create one rule per one corpus/data files" into main am: 8edcba4c2f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652761

Change-Id: Id49466c64c55d80ac102a989c50a245c4a575988
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 16:23:26 +00:00
Treehugger Robot
8edcba4c2f Merge "Create one rule per one corpus/data files" into main 2023-07-18 15:37:25 +00:00
Ivan Lozano
4387b7e860 Merge "rust: Add vendor and recovery dylib support." into main am: 87987fd058
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2657555

Change-Id: I3492b1ec493ee11733d1b6b341c7997b4f12572c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 13:50:18 +00:00
Ivan Lozano
87987fd058 Merge "rust: Add vendor and recovery dylib support." into main 2023-07-18 13:08:08 +00:00
Inseob Kim
3b24406dda Create one rule per one corpus/data files
To avoid MAX_ARG_STRLEN hardlimit.

Test: build and check intermediate directory
Change-Id: I44db1ed14cae4de6ace5b25a392d394d0f9f617a
2023-07-18 12:38:08 +00:00
Yi Kong
ddffe72b92 isCfi should query the mutated version
... similar to isFuzzer.

Test: verify libaudioflinger_timing does not have duplicate -flto flags
Bug: 289475610
Change-Id: Id7e5ec90b1b445f09f8b2ea164289450a77dfbb5
2023-07-18 16:40:36 +09:00
Treehugger Robot
edbaeba4d4 Merge "Add product name to the opt-in ABI error message" into main am: 0b5ca6ad06
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2640401

Change-Id: Ide8086ffeece843b5649c7eead61463848e86c88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 07:11:09 +00:00
Treehugger Robot
0b5ca6ad06 Merge "Add product name to the opt-in ABI error message" into main 2023-07-18 06:28:03 +00:00
Kiyoung Kim
e623c58cc6 Install VNDK libraries into vendor or product lib with flag
Install VNDK libraries into vendor or product lib when flag
'KEEP_VNDK' is set as false from build. This flag will be used to
test while deprecating VNDK step by step.

Bug: 290157355
Test: build succeded with DEPRECATE_VNDK succeded
Test: Cuttlefish boot succeded with sepolicy disabled
Change-Id: I05b166f054113ae2775df4e310916d0ea4af3fb6
2023-07-18 02:02:57 +00:00
Treehugger Robot
de48cc32a5 Merge "Add write_if_changed property to genrule" into main am: 26a54045be
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2648169

Change-Id: I3d588852d4886e8e8397e8af46ac365e6abd18f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 00:44:42 +00:00
Treehugger Robot
26a54045be Merge "Add write_if_changed property to genrule" into main 2023-07-17 23:59:23 +00:00
Zi Wang
7873f613c4 java_test macro needs srcs and deps to create .jar for tradefed_test_suite
Test: java_test_host_conversion_test.go and TH

Bug: 280452825
Change-Id: Ibf0c7eed415fc58a4d228f0347ab125fdc4466e4
2023-07-17 16:39:07 -07:00
Cole Faust
f8231dd0ea Platform mapping-based product config
This allows us to set product variables as build settings instead
of loading them from a target's provider, which further allows us
to read product config variables in transitions.

Bug: 287539062
Bug: 269577299
Test: Presubmits
Change-Id: I8497703f706162572ceb3486240e1eb02a37f5f6
2023-07-17 16:27:08 -07:00
Cole Faust
b51a05844c Use rbc_dashboard.py instead of rbc_regression_test.sh
rbc_dashboard.py is an alternative implementation of
rbc_regression_test.sh. These tests both run soong 2 times with
starlark product config enabled/disabled and diff the resulting ninja
files. However, the shell script test runs the soong invications in
series and the python one runs them in parallel, meaning the python
one is faster. On my computer the shell one takes ~7 minutes and the
python one takes ~4 minutes.

Bug: 291548757
Test: Presubmits
Change-Id: I20fd6ca09f47dd0547f2681fbd78ba70991493b0
2023-07-17 23:20:57 +00:00
AdityaK
111d68053b Enable scs for riscv64
https://github.com/google/android-riscv64/issues/106

Bug: b/277909695

Change-Id: I2ea0d41fd9dc43b3fefb748d10694917034ab586
2023-07-17 22:43:44 +00:00
Wei Li
08246b92a6 Ignore some new files added to partition images in sbom_test.sh.
Test: build/soong/tests/sbom_test.sh
Change-Id: I883ba741a47120f56f9f4d0594caebe78ce5242d
2023-07-17 11:33:33 -07:00
Colin Cross
d4875a4ae6 Merge changes Ied0a6cfe,I8c025efe into main am: adb892c539
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2658796

Change-Id: Iaa8bd9ce181b6bb6375209b25d6930484fd7da13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 17:16:04 +00:00
Colin Cross
adb892c539 Merge changes Ied0a6cfe,I8c025efe into main
* changes:
  Reland: Use depsets for transitive manifests and assets
  Add test for manifest merger
2023-07-17 16:30:55 +00:00
Romain Jobredeaux
039fc06a5b Allowlist ModuleMetadata
Test: builds locally + CI
Bug: 290770463
Change-Id: Ib36d1ae1a7f71716cb1703e5cdf0d5b45904fca4
2023-07-17 12:09:09 -04:00
Alix Espino
77a01c4809 Merge changes from topics "errProne_bp2build_manually_enabled", "error_prone_config" into main am: 2a779ea829
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2631710

Change-Id: Ifd9c2bc04a27072a3735ee777f09b50515ee4d01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 14:14:26 +00:00
Treehugger Robot
296e7ed439 Merge "Log the command line to soong.log when soong_ui starts" into main am: 90d8f5514d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2659056

Change-Id: Ia4494303157ef4b1d9fe2a68ead9982fd3dce33b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 14:13:43 +00:00
Liz Kammer
d38c87c035 Make genrule export_include_dirs more consistent
Previously, genrule export_include_dirs always added ModuleDir to
exported include dirs when export_include_dirs is set but not when
export_include_dirs is not set. Now when export_include_dirs is set, we
also export the directory without the additional ModuleDir subdir.

Test: genrule go tests
Test: set export_include_dirs and test
Change-Id: I46e860b2c20c1a96bddd14367d7fa737d901994d
2023-07-17 09:58:50 -04:00
Alix Espino
2a779ea829 Merge changes from topics "errProne_bp2build_manually_enabled", "error_prone_config" into main
* changes:
  Bp2build for errorprone modules that manually enabled/disabled it
  Make errorprone a configurable attribute for bazel conversion
2023-07-17 13:54:50 +00:00
Treehugger Robot
90d8f5514d Merge "Log the command line to soong.log when soong_ui starts" into main 2023-07-17 13:23:17 +00:00
Justin Yun
4da4ccc203 Add write_if_changed property to genrule
When "write_if_changed: true" is set, it will call restat for ninja.
With this option the output file will be copied only if it is changed.

Bug: 290130959
Test: ninja rule include "--write-if-changed"
Change-Id: I8bd77b43b22eb0115e0bdc73718b2d6997d92652
2023-07-17 20:35:13 +09:00
Alyssa Ketpreechasawat
ef542cd0af Merge "Fix the number of required parameters in deapexer script." into main am: 06ef4d954e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2658856

Change-Id: I7daf8e33091272b98e7a7d27bf05053c60603db1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 08:55:54 +00:00