Commit Graph

40673 Commits

Author SHA1 Message Date
Paul Duffin
ea1ef0beaf Merge "Add dependencies from platform_bootclasspath to contents" am: d32118c5c4 am: 6caf7f9662 am: 42418e09a2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1670066

Change-Id: I564c75f572a5ad78f66695829b50ec999423addc
2021-04-08 21:55:51 +00:00
Paul Duffin
be455a29b5 Merge "Add deapexer support for apex_set" am: d137306c16 am: ada746ce26 am: 6a98d68960
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1665744

Change-Id: I17e1e7feb52eb2b162b94f4e31fa3fc777dd5bf0
2021-04-08 21:55:44 +00:00
Treehugger Robot
c117d629ab Merge "Move cquery RequestType interface to bazel_handler" am: fd233d9078 am: c848b4ae11 am: 0a0d9d604b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1664541

Change-Id: Ib00d830b0ba5b9354bbdc2d34097072856aff326
2021-04-08 21:55:34 +00:00
Paul Duffin
42418e09a2 Merge "Add dependencies from platform_bootclasspath to contents" am: d32118c5c4 am: 6caf7f9662
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1670066

Change-Id: I34fc991b5efafc5df447dc4fd783d1734d0737be
2021-04-08 21:07:02 +00:00
Paul Duffin
6a98d68960 Merge "Add deapexer support for apex_set" am: d137306c16 am: ada746ce26
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1665744

Change-Id: I3548ef332169ce3ad9477f7ad2d2e78a78f6de66
2021-04-08 21:06:56 +00:00
Treehugger Robot
0a0d9d604b Merge "Move cquery RequestType interface to bazel_handler" am: fd233d9078 am: c848b4ae11
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1664541

Change-Id: I4a7e69f47d723f6537dace9f1b9f2218bc44f3e7
2021-04-08 21:06:45 +00:00
Paul Duffin
6caf7f9662 Merge "Add dependencies from platform_bootclasspath to contents" am: d32118c5c4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1670066

Change-Id: I81b7ce6f9996aac7b0e93981b6a4b53cb25643e3
2021-04-08 20:45:30 +00:00
Paul Duffin
d32118c5c4 Merge "Add dependencies from platform_bootclasspath to contents" 2021-04-08 20:34:03 +00:00
Paul Duffin
ada746ce26 Merge "Add deapexer support for apex_set" am: d137306c16
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1665744

Change-Id: I62582e081ae09178199421baabfdc429832530f6
2021-04-08 20:24:30 +00:00
Treehugger Robot
c848b4ae11 Merge "Move cquery RequestType interface to bazel_handler" am: fd233d9078
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1664541

Change-Id: I4efb2ad78134910a82c083c3bef9498fdff12e73
2021-04-08 20:23:27 +00:00
Paul Duffin
d137306c16 Merge "Add deapexer support for apex_set" 2021-04-08 20:19:13 +00:00
Treehugger Robot
fd233d9078 Merge "Move cquery RequestType interface to bazel_handler" 2021-04-08 19:28:29 +00:00
Rupert Shuttleworth
99f726e28b Merge "Be more explicit about headers in cc_library_static targets." am: a18b3b66cd am: d970597f59 am: fd415679bf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1664504

Change-Id: I4e5ab5575583bb869f790d447190d939fb07183d
2021-04-08 18:43:24 +00:00
Paul Duffin
b432df9cda Add dependencies from platform_bootclasspath to contents
Adds a FinalDeps mutator to add dependencies from the
platform_bootclasspath to the configured boot jars which can be from
either the platform or any apex. It adds dependencies for every
configured boot jar, whether in ArtApexJars, BootJars or
UpdatableBootJars.

At the moment the dependencies are only used for testing purposes
but following changes will make more use of them.

Bug: 177892522
Test: m nothing
Change-Id: I981305bf45bc20539a3d36987252f490e2b885cc
2021-04-08 18:53:04 +01:00
Rupert Shuttleworth
fd415679bf Merge "Be more explicit about headers in cc_library_static targets." am: a18b3b66cd am: d970597f59
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1664504

Change-Id: I272258cc4762749efb89ad276d27e5aa4672fd98
2021-04-08 17:46:56 +00:00
Rupert Shuttleworth
d970597f59 Merge "Be more explicit about headers in cc_library_static targets." am: a18b3b66cd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1664504

Change-Id: I5bf5dde7ccdca76fc16c7af6ac8d86a63b812ba8
2021-04-08 17:05:53 +00:00
Rupert Shuttleworth
a18b3b66cd Merge "Be more explicit about headers in cc_library_static targets." 2021-04-08 16:30:40 +00:00
Thiébaud Weksteen
43c0cfdb02 Merge "rust: collect file dependencies for clippy" am: a8ccbaf1e8 am: 0384ba1092 am: c9d80b74a3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1665885

Change-Id: I6d008c466626f1ddb7f44c897526d530360c3385
2021-04-08 15:33:45 +00:00
Lukács T. Berki
0d54e4d393 Merge "Organize Soong's integration tests:" am: c0060dcfa3 am: 92680b17f8 am: 0702059f87
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1669866

Change-Id: I2709fb09a7f4f98e35c4a8ce37457a5e07155e65
2021-04-08 15:33:39 +00:00
Paul Duffin
f6a780846d Merge "Separate apex extraction from the ApexSet" am: b14f2f067c am: 4cb71138e7 am: 76e8cd50ef
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1665743

Change-Id: I07d2011f415c03c94da049f5f8080cf98ad5ee3f
2021-04-08 15:33:31 +00:00
Thiébaud Weksteen
c9d80b74a3 Merge "rust: collect file dependencies for clippy" am: a8ccbaf1e8 am: 0384ba1092
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1665885

Change-Id: Iadbcf13f6f4b52af75498950ad4acc5cf032089d
2021-04-08 14:41:10 +00:00
Lukács T. Berki
0702059f87 Merge "Organize Soong's integration tests:" am: c0060dcfa3 am: 92680b17f8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1669866

Change-Id: I98b25a26355191766d1a48aefb71c5beec20d9f8
2021-04-08 14:41:05 +00:00
Paul Duffin
76e8cd50ef Merge "Separate apex extraction from the ApexSet" am: b14f2f067c am: 4cb71138e7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1665743

Change-Id: I1b1b9133981cbb09122648f35e5b12670ac40030
2021-04-08 14:40:57 +00:00
Paul Duffin
0d96c39af6 Merge "Move deapexer related functionality to prebuiltCommon" am: 1cec110476 am: bc8b938e8e am: 1c8bf42eff
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1665742

Change-Id: Id22f68fc3b4e27fb871915ac89670773a3a4a07d
2021-04-08 14:17:52 +00:00
Pedro Loureiro
d97aaa5983 [automerger skipped] Update soong for new lint version am: 9dcbfa4ae1 -s ours
am skip reason: skip tag Change-Id Iaa9d37ef73f1fef5f2dbb8a840e774bb86c65bf7 with SHA-1 70acc3dc0c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/14126825

Change-Id: I5698a05f1e4b158a436f0cc37737c904b4c78d2a
2021-04-08 13:54:43 +00:00
Thiébaud Weksteen
0384ba1092 Merge "rust: collect file dependencies for clippy" am: a8ccbaf1e8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1665885

Change-Id: I640bcb97f3746c7694f60f85f04b4f3a4f0bfa1d
2021-04-08 13:51:03 +00:00
Lukács T. Berki
92680b17f8 Merge "Organize Soong's integration tests:" am: c0060dcfa3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1669866

Change-Id: I303f259b5307a36975fbe1ac9f35fa3cd3d8f24d
2021-04-08 13:50:56 +00:00
Paul Duffin
4cb71138e7 Merge "Separate apex extraction from the ApexSet" am: b14f2f067c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1665743

Change-Id: I9c04ed6a4210b347bdfaf690c2bb624d804a4f45
2021-04-08 13:50:25 +00:00
Thiébaud Weksteen
a8ccbaf1e8 Merge "rust: collect file dependencies for clippy" 2021-04-08 13:31:34 +00:00
Paul Duffin
1c8bf42eff Merge "Move deapexer related functionality to prebuiltCommon" am: 1cec110476 am: bc8b938e8e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1665742

Change-Id: Ib6a655286af25da2e18ad8e6bc9c0ff0ec402d0e
2021-04-08 13:30:19 +00:00
Lukács T. Berki
c0060dcfa3 Merge "Organize Soong's integration tests:" 2021-04-08 13:07:14 +00:00
Paul Duffin
b14f2f067c Merge "Separate apex extraction from the ApexSet" 2021-04-08 13:00:23 +00:00
Paul Duffin
bc8b938e8e Merge "Move deapexer related functionality to prebuiltCommon" am: 1cec110476
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1665742

Change-Id: I7bf86deb3db6df43052ba4d7bbf0ce10c2018db3
2021-04-08 12:46:37 +00:00
Paul Duffin
1cec110476 Merge "Move deapexer related functionality to prebuiltCommon" 2021-04-08 11:58:55 +00:00
Anton Hansson
57e91234db Merge "Fix bug in sdk_library string matching" am: f247ff73ae am: abde6d24d4 am: aa963fda38
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1665886

Change-Id: I4603a16491e348520fa13cf5b086314ef26e12cf
2021-04-08 11:22:16 +00:00
Thiébaud Weksteen
f43ca81ec6 Merge "rust: Add cfgs property" am: e54504e19c am: 48e488b71f am: e5608ef6df
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1665883

Change-Id: I9c0b5b070d098f7183953b9aa0f907fb1a193faf
2021-04-08 11:22:08 +00:00
Lukacs T. Berki
3b730c4bc8 Organize Soong's integration tests:
- Move them into a new directory
- Split tests by theme and add a library file
- Add a shell script that runs them all

Test: Manually ran build/soong/run_integration_tests.sh .
Change-Id: I758b91d679f41aee47d15472cc02547ce89f6386
2021-04-08 13:21:13 +02:00
Pedro Loureiro
9dcbfa4ae1 Update soong for new lint version
Test: m nothing
Merged-In: Iaa9d37ef73f1fef5f2dbb8a840e774bb86c65bf7
Change-Id: Iaa9d37ef73f1fef5f2dbb8a840e774bb86c65bf7
2021-04-08 12:16:46 +01:00
Anton Hansson
aa963fda38 Merge "Fix bug in sdk_library string matching" am: f247ff73ae am: abde6d24d4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1665886

Change-Id: I5eb9be1a5cbc964f5bfe89077b381625d52f4de5
2021-04-08 10:36:03 +00:00
Thiébaud Weksteen
e5608ef6df Merge "rust: Add cfgs property" am: e54504e19c am: 48e488b71f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1665883

Change-Id: Ic8c29399deaff88442d024f8ef968aa7402d0085
2021-04-08 10:35:20 +00:00
Bram Bonné
510332b751 Merge "Allow Rust code in system/logging/rust" am: 2b9ee14ce0 am: f5277e8a49 am: 4af35dfe2c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652625

Change-Id: Ibb405cbeace6f5b715bf2250aa0b89e6d1d5e798
2021-04-08 09:51:59 +00:00
Anton Hansson
abde6d24d4 Merge "Fix bug in sdk_library string matching" am: f247ff73ae
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1665886

Change-Id: Ia06beabd8b9cfca9a6c2f7735d79086f39ecf1a5
2021-04-08 09:46:59 +00:00
Rupert Shuttleworth
c58d3d214e Be more explicit about headers in cc_library_static targets.
Test: bp2build-sync.py write; bazel build //bionic/...
Change-Id: I253b55f4d3cbe76805691b32e761016950871601
2021-04-08 09:43:04 +00:00
Anton Hansson
f247ff73ae Merge "Fix bug in sdk_library string matching" 2021-04-08 09:28:41 +00:00
Thiébaud Weksteen
48e488b71f Merge "rust: Add cfgs property" am: e54504e19c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1665883

Change-Id: I3402d26f4948eb269da6f69a709ea4c9d3646ce4
2021-04-08 09:27:13 +00:00
Bram Bonné
4af35dfe2c Merge "Allow Rust code in system/logging/rust" am: 2b9ee14ce0 am: f5277e8a49
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652625

Change-Id: I591cd667ddad7a4f853e566cf1fbf4934dafe591
2021-04-08 09:06:40 +00:00
Thiébaud Weksteen
e54504e19c Merge "rust: Add cfgs property" 2021-04-08 08:57:22 +00:00
Bram Bonné
f5277e8a49 Merge "Allow Rust code in system/logging/rust" am: 2b9ee14ce0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652625

Change-Id: I43ec1887fd86f406a5bf36015aba7aee919678cc
2021-04-08 08:22:37 +00:00
Bram Bonné
2b9ee14ce0 Merge "Allow Rust code in system/logging/rust" 2021-04-08 07:47:45 +00:00
Rupert Shuttleworth
2e845e53af Merge "Support arch variations for export_system_include_dirs in cc_library_headers bp2build converter." am: 64a90286c4 am: 197a03958b am: 4f95eb9f95
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1665920

Change-Id: I81dd1f49fabd9ca42fd0faaa4aef213551c052e5
2021-04-08 07:46:05 +00:00