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

Fail the build if dexpreopt cannot find path to a <uses-library>.

Browse Source 
This doesn't apply to compatibility libraries (those added to
conditional class loader context base on the targetSdkVersion in the
manifest), because Soong doesn't know if they are needed or not (the
build rule that parses the manifest runs at Ninja stage).

In the future we may need to relax this and instead of failing the build
to disable dexpreopt in such cases. But currently there are no use cases
that fail.

Also, this patch replaces hardcoded install path with a constant.

Test: lunch aosp_cf_x86_phone-userdebug && m
Bug: 132357300
Change-Id: Ic894bc17e8ffd8ff173111ea09366252001ef3e9
This commit is contained in:
Ulya Trafimovich
2020-09-23 16:55:42 +01:00
parent 39b437b25f
commit a54d33be77
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
dexpreopt/dexpreopt.go
View File

@@ -218,13 +218,21 @@ func (m classLoaderContextMap) getValue(sdkVer int) *classLoaderContext {
return m[sdkVer] return m[sdkVer]
} }
func (m classLoaderContextMap) addLibs(sdkVer int, module *ModuleConfig, libs ...string) bool { func (m classLoaderContextMap) addLibs(ctx android.PathContext, sdkVer int, module *ModuleConfig, libs ...string) bool {
clc := m.getValue(sdkVer) clc := m.getValue(sdkVer)
for _, lib := range libs { for _, lib := range libs {
if p := pathForLibrary(module, lib); p != nil { if p, ok := module.LibraryPaths[lib]; ok && p.Host != nil && p.Device != UnknownInstallLibraryPath {
clc.Host = append(clc.Host, p.Host) clc.Host = append(clc.Host, p.Host)
clc.Target = append(clc.Target, p.Device) clc.Target = append(clc.Target, p.Device)
} else { } else {
if sdkVer == anySdkVersion {
// Fail the build if dexpreopt doesn't know paths to one of the <uses-library>
// dependencies. In the future we may need to relax this and just disable dexpreopt.
android.ReportPathErrorf(ctx, "dexpreopt cannot find path for <uses-library> '%s'", lib)
} else {
// No error for compatibility libraries, as Soong doesn't know if they are needed
// (this depends on the targetSdkVersion in the manifest).
}
return false return false
} }
} }
@@ -270,14 +278,14 @@ func genClassLoaderContext(ctx android.PathContext, global *GlobalConfig, module
} else if module.EnforceUsesLibraries { } else if module.EnforceUsesLibraries {
// Unconditional class loader context. // Unconditional class loader context.
usesLibs := append(copyOf(module.UsesLibraries), module.OptionalUsesLibraries...) usesLibs := append(copyOf(module.UsesLibraries), module.OptionalUsesLibraries...)
if !classLoaderContexts.addLibs(anySdkVersion, module, usesLibs...) { if !classLoaderContexts.addLibs(ctx, anySdkVersion, module, usesLibs...) {
return nil return nil
} }
// Conditional class loader context for API version < 28. // Conditional class loader context for API version < 28.
const httpLegacy = "org.apache.http.legacy" const httpLegacy = "org.apache.http.legacy"
if !contains(usesLibs, httpLegacy) { if !contains(usesLibs, httpLegacy) {
if !classLoaderContexts.addLibs(28, module, httpLegacy) { if !classLoaderContexts.addLibs(ctx, 28, module, httpLegacy) {
return nil return nil
} }
} }
@@ -287,14 +295,14 @@ func genClassLoaderContext(ctx android.PathContext, global *GlobalConfig, module
"android.hidl.base-V1.0-java", "android.hidl.base-V1.0-java",
"android.hidl.manager-V1.0-java", "android.hidl.manager-V1.0-java",
} }
if !classLoaderContexts.addLibs(29, module, usesLibs29...) { if !classLoaderContexts.addLibs(ctx, 29, module, usesLibs29...) {
return nil return nil
} }
// Conditional class loader context for API version < 30. // Conditional class loader context for API version < 30.
const testBase = "android.test.base" const testBase = "android.test.base"
if !contains(usesLibs, testBase) { if !contains(usesLibs, testBase) {
if !classLoaderContexts.addLibs(30, module, testBase) { if !classLoaderContexts.addLibs(ctx, 30, module, testBase) {
return nil return nil
} }
} }
@@ -589,14 +597,6 @@ func PathToLocation(path android.Path, arch android.ArchType) string {
return filepath.Join(filepath.Dir(filepath.Dir(path.String())), filepath.Base(path.String())) return filepath.Join(filepath.Dir(filepath.Dir(path.String())), filepath.Base(path.String()))
} }
func pathForLibrary(module *ModuleConfig, lib string) *LibraryPath {
if path, ok := module.LibraryPaths[lib]; ok && path.Host != nil && path.Device != "error" {
return path
} else {
return nil
}
}
func makefileMatch(pattern, s string) bool { func makefileMatch(pattern, s string) bool {
percent := strings.IndexByte(pattern, '%') percent := strings.IndexByte(pattern, '%')
switch percent { switch percent {