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

Merge "Create prebuilt system modules for all API scopes" am: 2bbd2c55c5

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

Change-Id: I180ae8fa05ab72e4e3c6c0cce5a19eea55d6f395
This commit is contained in:
Treehugger Robot
2021-11-01 19:33:16 +00:00
committed by Automerger Merge Worker
parent 061abc7259 2bbd2c55c5
commit ef70b722db
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
java/prebuilt_apis.go
View File

@@ -167,30 +167,24 @@ func prebuiltSdkStubs(mctx android.LoadHookContext, p *prebuiltApis) {
localPath := strings.TrimPrefix(f, mydir) localPath := strings.TrimPrefix(f, mydir)
module, apiver, scope := parseJarPath(localPath) module, apiver, scope := parseJarPath(localPath)
createImport(mctx, module, scope, apiver, localPath, sdkVersion, compileDex) createImport(mctx, module, scope, apiver, localPath, sdkVersion, compileDex)
if module == "core-for-system-modules" {
createSystemModules(mctx, apiver, scope)
}
} }
} }
func createSystemModules(mctx android.LoadHookContext, apiver string) { func createSystemModules(mctx android.LoadHookContext, apiver string, scope string) {
props := struct { props := struct {
Name *string Name *string
Libs []string Libs []string
}{} }{}
props.Name = proptools.StringPtr(prebuiltApiModuleName(mctx, "system_modules", "public", apiver)) props.Name = proptools.StringPtr(prebuiltApiModuleName(mctx, "system_modules", scope, apiver))
props.Libs = append(props.Libs, prebuiltApiModuleName(mctx, "core-for-system-modules", "public", apiver)) props.Libs = append(props.Libs, prebuiltApiModuleName(mctx, "core-for-system-modules", scope, apiver))
mctx.CreateModule(systemModulesImportFactory, &props) mctx.CreateModule(systemModulesImportFactory, &props)
} }
func prebuiltSdkSystemModules(mctx android.LoadHookContext, p *prebuiltApis) {
for _, apiver := range p.properties.Api_dirs {
jar := android.ExistentPathForSource(mctx,
mctx.ModuleDir(), apiver, "public", "core-for-system-modules.jar")
if jar.Valid() {
createSystemModules(mctx, apiver)
}
}
}
func prebuiltApiFiles(mctx android.LoadHookContext, p *prebuiltApis) { func prebuiltApiFiles(mctx android.LoadHookContext, p *prebuiltApis) {
mydir := mctx.ModuleDir() + "/" mydir := mctx.ModuleDir() + "/"
// <apiver>/<scope>/api/<module>.txt // <apiver>/<scope>/api/<module>.txt
@@ -273,7 +267,6 @@ func createPrebuiltApiModules(mctx android.LoadHookContext) {
if p, ok := mctx.Module().(*prebuiltApis); ok { if p, ok := mctx.Module().(*prebuiltApis); ok {
prebuiltApiFiles(mctx, p) prebuiltApiFiles(mctx, p)
prebuiltSdkStubs(mctx, p) prebuiltSdkStubs(mctx, p)
prebuiltSdkSystemModules(mctx, p)
} }
} }