Commit Graph

83735 Commits

Author SHA1 Message Date
Cole Faust
cab168098f Make aninja work with alternate out dirs
Test: Manually
Change-Id: Ia7b18b04cabafa0bbce0232b32547f6d87059dc4
2024-08-23 13:02:55 -07:00
Hugo Drumond Jacob
079871cd55 Merge "Revert "Add a coverage suffix to avoid Ninja file regeneration."" into main 2024-08-21 17:20:34 +00:00
Treehugger Robot
5f42006902 Merge "Remove apexFilesForAndroidMk from prebuilt apex module types" into main 2024-08-21 16:53:00 +00:00
Hugo Drumond Jacob
134fa5df00 Revert "Add a coverage suffix to avoid Ninja file regeneration."
Revert submission 3207217-emma-flip-time-saver

Reason for revert: b/361236607

Reverted changes: /q/submissionid:3207217-emma-flip-time-saver

Change-Id: I7b4dcd3f6e73e302a2c3ef7ed5c02f6345619463
2024-08-21 13:07:06 +00:00
Elliott Hughes
9423b3f784 Merge "Use -fno-omit-frame-pointer for host linux." into main 2024-08-21 12:25:30 +00:00
Spandan Das
a18d42d324 Remove apexFilesForAndroidMk from prebuilt apex module types
This seems to be unused

Test: no diff in ninja file
Change-Id: Ib711294a4f30fe1db564e3b01d944e8813d0b4ac
2024-08-21 00:54:07 +00:00
Yu Liu
97bf07a2ef Merge "Remove build target related fields from ModuleBase." into main 2024-08-20 23:23:24 +00:00
Cole Faust
5fdb54d439 Merge "Make native_shared_libs configurable" into main 2024-08-20 23:03:31 +00:00
Treehugger Robot
0fd3de6151 Merge "Restrict R8 -libraryjars refs for stable targets" into main 2024-08-20 22:31:28 +00:00
Yu Liu
1c794c66c7 Merge "Use namespace path instead of id in phonies." into main 2024-08-20 22:02:07 +00:00
Yu Liu
ddc2e1ac09 Remove build target related fields from ModuleBase.
Bug: 358425833
Test: CI
Change-Id: I2af6d0d2fd3be70594860a0e6d86179d5850eb07
2024-08-20 21:31:22 +00:00
Jared Duke
2246844554 Restrict R8 -libraryjars refs for stable targets
The current R8 dex pipeline gathers transitive header jars to avoid
issues with missing class definitions. While this is benign for
platform targets not using a stable SDK, it can introduce issues
for stable targets (e.g., duplicate class defs for mainline framework
modules).

Bypass this transitive jar referencing for such targets that should
reference explicit, stable, stub API libraries. A follow-up change
will resolve specific issues with mainline system server targets.

Bug: 360905238
Test: m
Change-Id: I11a136d33ca9dd0dfff436c7045bf1807d17b1e7
2024-08-20 20:45:35 +00:00
Cole Faust
ac92f3e3f4 Make native_shared_libs configurable
So that you can use selects with it.

This cl also creates a ResolvedApexNativeDependencies to represent
a merged and evaluated set of ApexNativeDependencies. Previously other
properties added their own "resolved" versions individually, but I
think it's better design for the property structs to remain unchanged,
so I created a new non-property struct to contain the resolved values.
Immutable property structs is one of the things we want to add for
performance (removing property struct copies).

Bug: 342006386
Test: Presubmits
Change-Id: Ibf222c4a7c01df7d5ccc5a85b2e3c9b3f9243b9a
2024-08-20 13:26:52 -07:00
Cole Faust
b4cc88efef Merge "Only add deps on java_binary's jni_libs on host" into main 2024-08-20 20:03:54 +00:00
Treehugger Robot
800bde1021 Merge "Encode directly into file" into main 2024-08-20 19:36:46 +00:00
Yu Liu
460c0fa8b4 Use namespace path instead of id in phonies.
Otherwise the phones' names depend on the sorting order of all the
namespaces, which add unnecessary dependencies.

Bug: 358425833
Test: CI
Change-Id: Ic88a329ff320e508ece8e3b20c7497a28a619276
2024-08-20 19:34:49 +00:00
Elliott Hughes
8f977d2982 Merge "Use -fno-omit-frame-pointer for host windows." into main 2024-08-20 19:20:21 +00:00
Elliott Hughes
ed524b6313 Merge "Use -fno-omit-frame-pointer for host darwin." into main 2024-08-20 19:20:02 +00:00
Cole Faust
3dac486013 Only add deps on java_binary's jni_libs on host
The jni_libs property of java_binary is documented to only install
the jni libraries on host. However, it was adding installable
deptag deps on those libraries, even if they were for device. This
caused soong to emit installation rules for the jni libraries, causing
them to be installed to the staging directory, but not emitting
proper information to make, so they wouldn't be included on the built
partitions.

Only install them if the module is built for host, so that they don't
erroneously appear in the staging directory.

Bug: 344695913
Test: Presubmits
Change-Id: Ic40b4fc6d7dbd51c03b08e28037be5428db49c33
2024-08-20 11:44:04 -07:00
Yu Liu
ee5b92fd6c Merge "Add phonies as provider instead of updaing a global map." into main 2024-08-20 15:56:33 +00:00
Elliott Hughes
7ae6c16f51 Use -fno-omit-frame-pointer for host windows.
Helps with debugging/profiling.

Bug: http://b/245707217
Change-Id: I6c163c67a04ab53a0b8a00edb233e6d60404f0a4
2024-08-20 15:09:39 +00:00
Elliott Hughes
67612c37f1 Use -fno-omit-frame-pointer for host darwin.
Helps with debugging/profiling.

Bug: http://b/245707217
Change-Id: Ifbe2f6d05059d4ffee5c33ddec743188164100ef
2024-08-20 15:07:30 +00:00
Elliott Hughes
0b5dce6dae Use -fno-omit-frame-pointer for host linux.
Helps with debugging/profiling.

Bug: http://b/245707217
Change-Id: I6b2d4f73edbdbcdc36b3bf531341dd2dfb51a87c
2024-08-20 15:06:00 +00:00
Cole Faust
cda9ce15ff Merge "Add $(build_number_file) support to genrules" into main 2024-08-20 04:57:41 +00:00
Treehugger Robot
d4daa43150 Merge "apex: apex_available with prefix" into main 2024-08-20 02:45:22 +00:00
Jooyung Han
9a419e28f5 apex: apex_available with prefix
We now support prefix form (com.foo.*) in apex_available list.

Bug: 360265761
Test: m --no-skip-soong-tests
Change-Id: I50ab884651dd6321950cfd4563b59ef3ed0f07fd
2024-08-20 10:50:04 +09:00
Treehugger Robot
2d2df8cbfd Merge "Convert $(call soong_config_set_bool) to rbc" into main 2024-08-20 01:32:07 +00:00
Qing Shen
ff545caecd Merge "Add a coverage suffix to avoid Ninja file regeneration." into main 2024-08-20 01:16:53 +00:00
Cole Faust
5914aae79d Convert $(call soong_config_set_bool) to rbc
Bug: 342006386
Test: go test
Change-Id: I4729f25209d1d548b7b75c4d5bf2744ae4dcc31d
2024-08-19 17:34:46 -07:00
Cole Faust
78f3c3a3ad Add $(build_number_file) support to genrules
Genrules that set uses_order_only_build_number_file: true will now
have the ability to reference a $(build_number_file) label that
will point to the build number file. It will also caused the build
number file to be added as an order-only dependency, which will make
it show up in the genrule sandbox.

This is needed for converting make code that references the build
number to soong, and for sandboxing the remaining unsandboxed genrules
that reference the build number.

Bug: 341873065
Test: m nothing --no-skip-soong-tests
Change-Id: I9092cbb0eb39c5449a79f0ee40a4202262cef206
2024-08-19 16:06:34 -07:00
Cole Faust
5b1a39a92a Merge "Make the WholeStatic/Static/Shared libs properties configurable" into main 2024-08-19 22:48:16 +00:00
Yu Liu
54513622f7 Add phonies as provider instead of updaing a global map.
Bug: 358425833
Test: Manually compare the generated mk and ninja files.
Change-Id: Ie74b620fc680ca2fc0d7836e88361ab3bdb87c49
2024-08-19 21:45:07 +00:00
Cole Faust
f0006e7137 Make the WholeStatic/Static/Shared libs properties configurable
So that you can use selects with them.

Bug: 342006386
Bug: 358377461
Test: m nothing --no-skip-soong-tests
Change-Id: I5a8350f670d51b7da411ad5c3cdbf5f2d6cdd63b
2024-08-19 14:39:19 -07:00
Ronald Braunstein
ea66cdd278 Merge "Search for default_team in Android.bp when other .bp files are included." into main 2024-08-19 19:54:10 +00:00
Colin Cross
67478b347e Merge "Add test for interactions between product variables and arch variant properties" into main 2024-08-19 16:19:34 +00:00
Treehugger Robot
a5289ac9ef Merge changes Ia0e1b307,I63c7c33e into main
* changes:
  Define unstable container
  Define additional exception functions for container enforcement
2024-08-17 04:07:00 +00:00
Jihoon Kang
0f3b1a7288 Define unstable container
Unstable container marks modules that are static reverse dependencies of
"framework-minus-apex". These modules contain unstable implementation
details of the platform, and should not be accessed by the CTS tests.

Test: m nothing
Bug: 338660802
Change-Id: Ia0e1b3070f0f7b2c1b9c27306323e2428d9722ca
2024-08-16 22:57:57 +00:00
Jihoon Kang
224ea08ee6 Define additional exception functions for container enforcement
These exception functions allow restriction to be loosened for some
inter-container dependencies.

Note that these functions are still no-op. Restriction enforcement will
be done in the child change.

Test: m nothing
Bug: 338660802
Change-Id: I63c7c33e33f271d4c2a84cc6070eb4896e030ab4
2024-08-16 22:57:39 +00:00
Colin Cross
7c2af51a3d Merge "Track resources separately in java_import" into main 2024-08-16 22:30:33 +00:00
Treehugger Robot
75b14ee1a6 Merge "Clean up: remove com.android.gki.*" into main 2024-08-16 22:22:19 +00:00
Colin Cross
6ca3f758d0 Merge "Convert more stored WritablePaths to Paths" into main 2024-08-16 22:16:56 +00:00
Treehugger Robot
08e76d9591 Merge "Run "ravenizer" on ravenwood jars" into main 2024-08-16 22:16:41 +00:00
Yu Liu
fb995a1e3c Merge "Remove more internal fields from ModuleBase." into main 2024-08-16 22:14:01 +00:00
Colin Cross
f0df94a76d Merge "Move kotlin stdlib to normal dependency tag" into main 2024-08-16 21:01:23 +00:00
Colin Cross
f330b3dc77 Merge "Use rsp files to pass turbine inputs to RBE" into main 2024-08-16 20:18:09 +00:00
Makoto Onuki
7ded3827a4 Run "ravenizer" on ravenwood jars
Ravenizer is a new tool to preprocess ravenwood tests.

It can optionally be applied to other java targets (for analyzing them,
etc).

The actual tool is being implemented internally, so in AOSP, we just
use a script that copies the jar file as a replacement.

Test: manual -- run `m RavenwoodBivalentTest` and make sure the ravenizer
    log message shows up.
Flag: EXEMPT host test change only
Bug: 360390999
Change-Id: I6d1f81e7c425397b16c37e7c30267957097387fd
2024-08-16 12:08:35 -07:00
Colin Cross
53529a9061 Track resources separately in java_import
java_import currently collects the "implementation and resource jar"
from each of its dependencies.  This results in different resource
conflict resolution than other java modules, which collect
implementation jars and resource jars separately.  Modify java_import
to match the other module types.

Flag: EXEMPT refactor
Test: all soong tests pass
Change-Id: I06134e2621582799b3a525d2c12b900b8d86d171
2024-08-16 11:56:19 -07:00
Colin Cross
7da471f3ab Add test for interactions between product variables and arch variant properties
Add a test that verifies that arch variant product variable
properties are correctly squashed into the top level properties.

Bug: 322089980
Flag: EXEMPT test only
Test: TestProductVariablesArch
Change-Id: I62e9b4166761ce6ac0269e2fafc26d603e6b169e
2024-08-16 09:21:18 -07:00
Jooyung Han
40b7917fd0 Clean up: remove com.android.gki.*
It's abandoned.

Bug: n/a
Test: m nothing --no-skip-soong-tests
Change-Id: I220bea87329ee532d494cc4eaa4c6a8c1b0bff07
2024-08-16 16:02:42 +09:00
Colin Cross
77965d9bd4 Convert more stored WritablePaths to Paths
Similar to I40f28075ce151e4be80d6cfc7ec173dfa46f9bbf, convert
more long-lived WritablePaths to Paths.

Test: all soong tests pass
Flag: EXEMPT refactor
Change-Id: I9be448f811694fe0524fbbd7c5d4553cf69d533a
2024-08-15 20:43:39 -07:00