StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove compilation actions from java sdk library

Browse Source 
This change modifies the build actions of java_sdk_library module type
so that it does not perform any compilation actions (i.e. does not
create the top level java_sdk_library jar file). Instead, it delegates
the build actions the top level jar file was performing to the
dynamically created ".impl"-suffixed java library module. The build
actions that are delegated to the impl library module include hiddenapi
processing, dexing, and dexpreopt.

Test: m nothing --no-skip-soong-tests
Bug: 332785297
Change-Id: I7534f9eaacf6d9f72fbf8d540b1e26af84106c20
This commit is contained in:
Jihoon Kang
2024-04-05 00:36:44 +00:00
parent 2ddb22ce99
commit d831af4267
13 changed files with 162 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/hiddenapi_singleton.go
View File

@@ -150,6 +150,10 @@ func isModuleInConfiguredList(ctx android.BaseModuleContext, module android.Modu
// Strip a prebuilt_ prefix so that this can match a prebuilt module that has not been renamed.
name = android.RemoveOptionalPrebuiltPrefix(name)
// Strip the ".impl" suffix, so that the implementation library of the java_sdk_library is
// treated identical to the top level java_sdk_library.
name = strings.TrimSuffix(name, ".impl")
// Ignore any module that is not listed in the boot image configuration.
index := configuredBootJars.IndexOfJar(name)
if index == -1 {