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

Merge "Pass module-lib and system-server extension jars for system-server" into main am: 7a4d748669

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3072144

Change-Id: I596139c5cdd1e118dc99c4bfc9b40ca0feb97a0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-05-03 17:58:30 +00:00
committed by Automerger Merge Worker
parent ff74a33524 7a4d748669
commit 39435fdcd7
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
java/droidstubs.go
View File

@@ -626,7 +626,8 @@ func (d *Droidstubs) apiLevelsGenerationFlags(ctx android.ModuleContext, cmd *an
// privileged apps that are only defined since API level 21 (Lollipop), fallback to public stubs
// for older releases. Similarly, module-lib falls back to system API.
var sdkDirs []string
switch proptools.StringDefault(d.properties.Api_levels_sdk_type, "public") {
apiLevelsSdkType := proptools.StringDefault(d.properties.Api_levels_sdk_type, "public")
switch apiLevelsSdkType {
case "system-server":
sdkDirs = []string{"system-server", "module-lib", "system", "public"}
case "module-lib":
@@ -640,9 +641,22 @@ func (d *Droidstubs) apiLevelsGenerationFlags(ctx android.ModuleContext, cmd *an
return
}
// Construct a pattern to match the appropriate extensions that should be included in the
// generated api-versions.xml file.
//
// Use the first item in the sdkDirs array as that is the sdk type for the target API levels
// being generated but has the advantage over `Api_levels_sdk_type` as it has been validated.
extensionsPattern := fmt.Sprintf(`/extensions/[0-9]+/%s/.*\.jar`, sdkDirs[0])
// The exception is for system-server which needs to include module-lib and system-server. That
// is because while system-server extends module-lib the system-server extension directory only
// contains service-* modules which provide system-server APIs it does not list the modules which
// only provide a module-lib, so they have to be included separately.
extensionSurfacesPattern := sdkDirs[0]
if apiLevelsSdkType == "system-server" {
// Take the first two items in sdkDirs, which are system-server and module-lib, and construct
// a pattern that will match either.
extensionSurfacesPattern = strings.Join(sdkDirs[0:2], "|")
}
extensionsPattern := fmt.Sprintf(`/extensions/[0-9]+/(%s)/.*\.jar`, extensionSurfacesPattern)
var dirs []string
var extensions_dir string