Commit Graph

84342 Commits

Author SHA1 Message Date
Treehugger Robot
f9f708388a Merge changes I861a60e1,I01bf99fa,I9d16dfec into main am: 9678733731 am: fd440d75e5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3150116

Change-Id: I612cdbb3292da68820d7c2446fdba939112a28fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-16 01:29:47 +00:00
Treehugger Robot
fd440d75e5 Merge changes I861a60e1,I01bf99fa,I9d16dfec into main am: 9678733731
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3150116

Change-Id: I3745d3347b71ef589a74366f449041b0391d64a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-16 01:06:07 +00:00
Treehugger Robot
9678733731 Merge changes I861a60e1,I01bf99fa,I9d16dfec into main
* changes:
  Add util method HasIntersection(...)
  Implement InstallableModule for Java modules
  Collect container informations
2024-07-16 00:43:04 +00:00
Priyanka Advani
026f13b14c Merge "Revert "Switch host native tests to -Og"" into main am: 45d61d8b11 am: 803dffbdad
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3174221

Change-Id: Ic27ddf5e230b9c15cdc05252d176f540e9324025
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-16 00:00:56 +00:00
Jihoon Kang
b7e1a48376 Add util method HasIntersection(...)
Introduces a util method `HasIntersection(...)`, which returns true if
the two input lists have non-empty intersection.

Test: m nothing --no-skip-soong-tests
Bug: 338660802
Change-Id: I861a60e1973c92a773c127dfc595ad7514d7972f
2024-07-15 23:46:45 +00:00
Jihoon Kang
f86fe9a876 Implement InstallableModule for Java modules
This change enables the container information to be collected for Java
modules.

Test: m nothing --no-skip-soong-tests
Bug: 338660802
Change-Id: I01bf99fa274275a608601ad6248d577ae8f6dffc
2024-07-15 23:46:01 +00:00
Jihoon Kang
c3d4e115af Collect container informations
This change introduces a method to collect the information of what
containers (i.e. api domain, partition, or any custom defined boundaries
of interest) the module belongs to. The method is called in
`ModuleBase.GenerateBuildActions`.

Each container objects defines the following:
- name of the container
- list of "restrictions", which are the containers that a module that
  belongs to this container is not allowed to depend on. Each
  "restrictions" also defines custom rules which allow bypassing the
  restricted dependency. Each rules are an enum that are mapped to a
  function, given that functions are not hashable and thus cannot be set
  as a value in a provider.

Note that this change is a no-op, as the container information is only
collected for modules that implement the "InstallableModule" interface,
which is not implemented by any other module types in this change. This
will be utilized in the follow-up changes.

Test: m nothing --no-skip-soong-tests
Bug: 338660802
Change-Id: I9d16dfec0dcf06da464aa49ee7b23f46f1da236a
2024-07-15 23:43:36 +00:00
Priyanka Advani
803dffbdad Merge "Revert "Switch host native tests to -Og"" into main am: 45d61d8b11
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3174221

Change-Id: Ib56c3c6c71cda3b7a4fe1c4262e3b40fa922a446
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 23:30:01 +00:00
Priyanka Advani
45d61d8b11 Merge "Revert "Switch host native tests to -Og"" into main 2024-07-15 23:06:52 +00:00
Treehugger Robot
a3d04ee6e1 Merge "Fix asan build for Macos" into main am: 9408e95521 am: 92fd1f8b8c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3174681

Change-Id: Iaaa8a19c9d0127333f8d4044043a0c5d8c772242
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 23:06:47 +00:00
Liana Kazanova
b88279f3b8 Revert "Switch host native tests to -Og"
Revert submission 2695387-host-tests-Og

Reason for revert: Droidmonitor triggered revert due to build breakage in b/353353713. Will be verifying through ABTD before submission.


Reverted changes: /q/submissionid:2695387-host-tests-Og

Change-Id: Ia8c75f9476f52dfce959c424bdf6b483bdf95c9f
2024-07-15 23:04:09 +00:00
Treehugger Robot
92fd1f8b8c Merge "Fix asan build for Macos" into main am: 9408e95521
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3174681

Change-Id: Iec4886fc4c025dd62ecd57a3ce861971c8cb28e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 22:45:58 +00:00
Treehugger Robot
9408e95521 Merge "Fix asan build for Macos" into main 2024-07-15 22:24:54 +00:00
Colin Cross
34d66ad15d Merge "Add dot files that describe java compilation" into main am: 397db9d336 am: 6aa3fef0ba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3142039

Change-Id: I7f4b37f62564b7f782a8bbe47a408a5bae79d32b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 20:25:23 +00:00
Fabien Sanglard
4eea1b8e92 Fix asan build for Macos
Test: Continuous build once aosp/3169208 is merged again
Fixes: 349869396
Fixes: 349870640
Change-Id: I1d000aac10ce9842a1cd1c6d9eda0e02874f4d8a
2024-07-15 13:19:43 -07:00
Colin Cross
6aa3fef0ba Merge "Add dot files that describe java compilation" into main am: 397db9d336
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3142039

Change-Id: I385ebe3491c0caa6f43c65653e174c8fed2acec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 20:12:41 +00:00
Colin Cross
397db9d336 Merge "Add dot files that describe java compilation" into main 2024-07-15 19:51:45 +00:00
LaMont Jones
22f566a856 Merge "release_config: add value_directories to artifact" into main am: 8e5dbdb93b am: 72a1f0fddc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3168685

Change-Id: I0cb0792bfcf5db600722d8c2903ca58d07fe846e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 19:21:33 +00:00
LaMont Jones
72a1f0fddc Merge "release_config: add value_directories to artifact" into main am: 8e5dbdb93b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3168685

Change-Id: I56cfc3f08616dbce60b3f0b6e36a376cdbbf8b4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 19:05:00 +00:00
LaMont Jones
8e5dbdb93b Merge "release_config: add value_directories to artifact" into main 2024-07-15 18:40:15 +00:00
Yi Kong
b32e3605e4 Merge "Switch host native tests to -Og" into main am: b3769fcd23 am: 1c65e55a18
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2695387

Change-Id: I08d241293fae141248ca0db33f0cd318b0db92c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 08:52:27 +00:00
Yi Kong
1c65e55a18 Merge "Switch host native tests to -Og" into main am: b3769fcd23
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2695387

Change-Id: I180952584ff74a1bac3b04034f5b73d728f6eb2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 08:37:21 +00:00
Yi Kong
b3769fcd23 Merge "Switch host native tests to -Og" into main 2024-07-15 08:11:55 +00:00
Treehugger Robot
536fad002b Merge "Remove apex.use_vndk_as_stable" into main 2024-07-15 02:03:15 +00:00
LaMont Jones
9877b7e627 release_config: add value_directories to artifact
release_config_artifact.directories contains the ordered list of
release config map directories that contributed flag declarations and/or
flag values to the release config (ignoring inheritance).

release_config_artifact.value_directories contains the ordered list of
release config map directories where we found a release_config message
for this release config.

Also, improve various error messages.

Bug: None
Test: manual, TH
Change-Id: Ifb67e80fc8746ae466f2e3515c5b0c3ba07a291d
2024-07-12 14:47:52 -07:00
Zi Wang
9bd28063bd Merge "Use OutputFilesProvider in module_test" into main am: 2dbf71fed8 am: e216ad0e63
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3168574

Change-Id: I6459fc3c7ba9ccb45c27ee8f0c0b5bd0a2c59dc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-12 21:29:20 +00:00
Zi Wang
e216ad0e63 Merge "Use OutputFilesProvider in module_test" into main am: 2dbf71fed8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3168574

Change-Id: I42e3931176abc2ce62c587c481cb958b3f2dfc7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-12 21:08:15 +00:00
Zi Wang
2dbf71fed8 Merge "Use OutputFilesProvider in module_test" into main 2024-07-12 20:39:09 +00:00
mrziwang
1ea01e3c59 Use OutputFilesProvider in module_test
In the context of incremental soong, the output files
inter-module-communication will be through OutputFilesProvider.
The OutputFileProducer interface will be deprecated.

Test: CI
Bug: 339477385
Change-Id: Iaf0b039b17d34e1a696f2c87df2f0db39307fc6d
2024-07-12 12:26:34 -07:00
Colin Cross
f25c17c160 Remove obsolete rust VariantIsStatic am: 17f9dc5f76 am: ebbb6f6c35
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3163857

Change-Id: I3cce800140b15812424788691787fcfd55107d66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-12 00:52:15 +00:00
Colin Cross
e1e0284725 Don't forward apex dependencies to platform when they are added later am: 77c5e9f9d4 am: 45bc64348a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3163856

Change-Id: Ib09aeec381f8e7624128dc3898e83964424581ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-12 00:52:11 +00:00
Colin Cross
5e4ab3379b Add IsAddingDependency to IncomingTransitionContext am: e1a8555581 am: 4a6b31a65e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3141802

Change-Id: Ia16e9ef02996ce4d2b2a59383fd638d42b66a5d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-12 00:52:08 +00:00
Colin Cross
3af1745eeb Don't mutate non-property module fields am: 694fced1e3 am: 11bd07b97c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3147437

Change-Id: I4c18f6a477e5e87653fa0da14ce3d360e90fe4a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-12 00:52:04 +00:00
Colin Cross
ebbb6f6c35 Remove obsolete rust VariantIsStatic am: 17f9dc5f76
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3163857

Change-Id: Icb48a70d36410bf3e63513e4335e66e57bc3272d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-12 00:22:40 +00:00
Colin Cross
45bc64348a Don't forward apex dependencies to platform when they are added later am: 77c5e9f9d4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3163856

Change-Id: I7937f30851bc30ee28206c787a0fdca42683b340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-12 00:22:34 +00:00
Colin Cross
4a6b31a65e Add IsAddingDependency to IncomingTransitionContext am: e1a8555581
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3141802

Change-Id: Ib8f5bfbb73b467e74063d15e8644aac8c6298276
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-12 00:22:31 +00:00
Colin Cross
11bd07b97c Don't mutate non-property module fields am: 694fced1e3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3147437

Change-Id: Ib03a20529827e9f7d49d33a5e3972cf1bbaf0703
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-12 00:22:26 +00:00
Colin Cross
f52bbd36e6 Add dot files that describe java compilation
Test: N/A
Change-Id: I70897a680377a30e39552bfafc4d17a94837765c
2024-07-11 17:20:22 -07:00
Colin Cross
17f9dc5f76 Remove obsolete rust VariantIsStatic
Rust modules no longer have static variants after
I2925f67f6dc9329dae3dcccafb8560900ac8a6fc, remove the VariantIsStatic
field.

Bug: 254469782
Test: m
Test: m blueprint_tests
Change-Id: Ic63412a27c3a09dec43c4a9064a3e1f4181147db
2024-07-11 16:59:34 -07:00
Colin Cross
77c5e9f9d4 Don't forward apex dependencies to platform when they are added later
IncomingApexTransition normally returns "" for modules that have
no apex variation so that apex variations can depend on non-apex
variations, for example for NDK libraries.

addDependencyOntoApexModulePair uses OtherModuleDependencyVariantExists
to decide whether to add a dependency on a module in an apex.  If
IncomingApexTransition returns "" then OtherModuleDependencyVariantExists
will always return true.  Return the incoming variation when addding
dependencies after the apex transition mutator has already run.

Bug: 319288033
Flag: EXEMPT bugfix
Test: all soong tests pass with later patches applied
Change-Id: Iec40c3be2ed04dca16a9fa6fa0a1c31056b536a8
2024-07-11 16:59:34 -07:00
Colin Cross
e1a8555581 Add IsAddingDependency to IncomingTransitionContext
Add an IsAddingDependency method to IncomingTransitionContext that
returns true if IncomingTransition is called after the transition
has already won while adding a new dependency.  This will be used
as part of the transition mutators to support an apex use case where
incoming dependencies during the initial apex mutator need to be
rewritten onto the platform variant for modules that don't support
the apex, but a later call to OtherModuleDependencyVariantExists
must not rewrite the requested apex variation onto the platform
variant.

This should be used sparingly, all uses will have to be removed in
order to support creating variants on demand.

Bug: 319288033
Test: TestIsAddingDependency
Flag: EXEMPT refactor
Change-Id: Ib8e419d35ff8f7cbff9667c1cd40d05ccfacab8b
2024-07-11 16:59:34 -07:00
Colin Cross
694fced1e3 Don't mutate non-property module fields
Setting sanitize and stl to nil in a mutator isn't valid, if any other
mutator creates a variant then the factory method will be called again
to create the new variants and will reset sanitize and stl to non-nil.
Add a property to sanitize and check it everywhere that checked for
sanitize != nil, and set the Stl property.

Bug: 319288033
Test: all soong tests pass
Flag: EXEMPT refactor
Change-Id: If99d5fa0f088ee4a73cc7dccdab4268618a6009f
2024-07-11 16:59:33 -07:00
Treehugger Robot
2f587ee74b Merge "Pass the --cfg soong flag when building rustdoc" into main am: e7485b871a am: f8fab053f4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3167617

Change-Id: I636e67e6d70fbba4fef30e1d60942da812db55c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 22:57:42 +00:00
Treehugger Robot
f8fab053f4 Merge "Pass the --cfg soong flag when building rustdoc" into main am: e7485b871a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3167617

Change-Id: Ie83bc97d21107ee834db25659a8af2a636edb5a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 22:33:56 +00:00
Treehugger Robot
e7485b871a Merge "Pass the --cfg soong flag when building rustdoc" into main 2024-07-11 22:19:19 +00:00
Treehugger Robot
d5bc27a99c Merge "Remove hidden_api_packages as it is no longer needed" into main am: 2f867fd9ac am: fdc5ce9cd6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3165142

Change-Id: I4f47f3a4d6e5991189c420525ddd27f1878dc9bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 21:32:11 +00:00
Treehugger Robot
fdc5ce9cd6 Merge "Remove hidden_api_packages as it is no longer needed" into main am: 2f867fd9ac
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3165142

Change-Id: Id0fa3c9b9b06bf4e766c63fec8321f2a6fb46151
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 21:12:47 +00:00
Colin Cross
8cd1fa9d0a Merge "Remove test_per_src" into main am: 088123934b am: d66ec63bde
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3142038

Change-Id: I0aab777c604498195d67bf8e70f338f3b373210c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 21:07:57 +00:00
Treehugger Robot
2f867fd9ac Merge "Remove hidden_api_packages as it is no longer needed" into main 2024-07-11 20:59:19 +00:00
Colin Cross
d66ec63bde Merge "Remove test_per_src" into main am: 088123934b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3142038

Change-Id: I9e0f306875ce0ad5c9767948a0d5d005b0751766
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 20:49:26 +00:00