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

Merge "Move part of logic from construct_context.py to Soong." am: e430ac338a

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

Change-Id: Ifb2dd5406a0706979dd7d814aa31e2893c93a4eb
This commit is contained in:
Ulyana Trafimovich
2020-10-29 14:32:48 +00:00
committed by Automerger Merge Worker
parent 9d5814ff7c e430ac338a
commit bc4e9d5f8a
4 changed files with 131 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
dexpreopt/dexpreopt.go
View File

@@ -328,9 +328,42 @@ func genClassLoaderContext(ctx android.PathContext, global *GlobalConfig, module
return &classLoaderContexts return &classLoaderContexts
} }
// Find build and install paths to "android.hidl.base". The library must be present in conditional
// class loader context for SDK version 29, because it's one of the compatibility libraries.
func findHidlBasePaths(ctx android.PathContext, clcMap classLoaderContextMap) (android.Path, string) {
var hostPath android.Path
targetPath := UnknownInstallLibraryPath
if clc, ok := clcMap[29]; ok {
for i, lib := range clc.Names {
if lib == AndroidHidlBase {
hostPath = clc.Host[i]
targetPath = clc.Target[i]
break
}
}
}
// Fail if the library paths were not found. This may happen if the function is called at the
// wrong time (either before the compatibility libraries were added to context, or after they
// have been removed for some reason).
if hostPath == nil {
android.ReportPathErrorf(ctx, "dexpreopt cannot find build path to '%s'", AndroidHidlBase)
} else if targetPath == UnknownInstallLibraryPath {
android.ReportPathErrorf(ctx, "dexpreopt cannot find install path to '%s'", AndroidHidlBase)
}
return hostPath, targetPath
}
// Now that the full unconditional context is known, reconstruct conditional context. // Now that the full unconditional context is known, reconstruct conditional context.
// Apply filters for individual libraries, mirroring what the PackageManager does when it // Apply filters for individual libraries, mirroring what the PackageManager does when it
// constructs class loader context on device. // constructs class loader context on device.
//
// TODO(b/132357300):
// - move handling of android.hidl.manager -> android.hidl.base dependency here
// - remove android.hidl.manager and android.hidl.base unless the app is a system app.
//
func fixConditionalClassLoaderContext(clcMap classLoaderContextMap) { func fixConditionalClassLoaderContext(clcMap classLoaderContextMap) {
usesLibs := clcMap.usesLibs() usesLibs := clcMap.usesLibs()
@@ -352,6 +385,52 @@ func fixConditionalClassLoaderContext(clcMap classLoaderContextMap) {
} }
} }
// Return the class loader context as a string and a slice of build paths for all dependencies.
func computeClassLoaderContext(ctx android.PathContext, clcMap classLoaderContextMap) (clcStr string, paths android.Paths) {
hidlBaseHostPath, hidlBaseTargetPath := findHidlBasePaths(ctx, clcMap)
for _, ver := range android.SortedIntKeys(clcMap) {
clc := clcMap.getValue(ver)
clcLen := len(clc.Names)
if clcLen != len(clc.Host) || clcLen != len(clc.Target) {
android.ReportPathErrorf(ctx, "ill-formed class loader context")
}
var hostClc, targetClc []string
var hostPaths android.Paths
for i := 0; i < clcLen; i++ {
hostStr := "PCL[" + clc.Host[i].String() + "]"
targetStr := "PCL[" + clc.Target[i] + "]"
// Add dependency of android.hidl.manager on android.hidl.base (it is not tracked as
// a regular dependency by the build system, so it needs special handling).
if clc.Names[i] == AndroidHidlManager {
hostStr += "{PCL[" + hidlBaseHostPath.String() + "]}"
targetStr += "{PCL[" + hidlBaseTargetPath + "]}"
hostPaths = append(hostPaths, hidlBaseHostPath)
}
hostClc = append(hostClc, hostStr)
targetClc = append(targetClc, targetStr)
hostPaths = append(hostPaths, clc.Host[i])
}
if hostPaths != nil {
sdkVerStr := fmt.Sprintf("%d", ver)
if ver == AnySdkVersion {
sdkVerStr = "any" // a special keyword that means any SDK version
}
clcStr += fmt.Sprintf(" --host-context-for-sdk %s %s", sdkVerStr, strings.Join(hostClc, "#"))
clcStr += fmt.Sprintf(" --target-context-for-sdk %s %s", sdkVerStr, strings.Join(targetClc, "#"))
paths = append(paths, hostPaths...)
}
}
return clcStr, paths
}
func dexpreoptCommand(ctx android.PathContext, globalSoong *GlobalSoongConfig, global *GlobalConfig, func dexpreoptCommand(ctx android.PathContext, globalSoong *GlobalSoongConfig, global *GlobalConfig,
module *ModuleConfig, rule *android.RuleBuilder, archIdx int, classLoaderContexts classLoaderContextMap, module *ModuleConfig, rule *android.RuleBuilder, archIdx int, classLoaderContexts classLoaderContextMap,
profile android.WritablePath, appImage bool, generateDM bool) { profile android.WritablePath, appImage bool, generateDM bool) {
@@ -422,20 +501,11 @@ func dexpreoptCommand(ctx android.PathContext, globalSoong *GlobalSoongConfig, g
} }
// Generate command that saves host and target class loader context in shell variables. // Generate command that saves host and target class loader context in shell variables.
clc, paths := computeClassLoaderContext(ctx, classLoaderContexts)
cmd := rule.Command(). cmd := rule.Command().
Text(`eval "$(`).Tool(globalSoong.ConstructContext). Text(`eval "$(`).Tool(globalSoong.ConstructContext).
Text(` --target-sdk-version ${target_sdk_version}`) Text(` --target-sdk-version ${target_sdk_version}`).
for _, ver := range android.SortedIntKeys(classLoaderContexts) { Text(clc).Implicits(paths)
if clc := classLoaderContexts.getValue(ver); len(clc.Host) > 0 {
verString := fmt.Sprintf("%d", ver)
if ver == AnySdkVersion {
verString = "any" // a special keyword that means any SDK version
}
cmd.Textf(`--host-classpath-for-sdk %s %s`, verString, strings.Join(clc.Host.Strings(), ":")).
Implicits(clc.Host).
Textf(`--target-classpath-for-sdk %s %s`, verString, strings.Join(clc.Target, ":"))
}
}
cmd.Text(`)"`) cmd.Text(`)"`)
} else { } else {
// Pass special class loader context to skip the classpath and collision check. // Pass special class loader context to skip the classpath and collision check.

43
java/app_test.go
View File

@@ -2812,51 +2812,52 @@ func TestUsesLibraries(t *testing.T) {
t.Errorf("wanted %q in %q", w, cmd) t.Errorf("wanted %q in %q", w, cmd)
} }
// Test that all present libraries are preopted, including implicit SDK dependencies, possibly stubs. // Test that all present libraries are preopted, including implicit SDK dependencies, possibly stubs
cmd = app.Rule("dexpreopt").RuleParams.Command cmd = app.Rule("dexpreopt").RuleParams.Command
w := `--target-classpath-for-sdk any` + w := `--target-context-for-sdk any ` +
` /system/framework/foo.jar` + `PCL[/system/framework/foo.jar]#` +
`:/system/framework/quuz.jar` + `PCL[/system/framework/quuz.jar]#` +
`:/system/framework/qux.jar` + `PCL[/system/framework/qux.jar]#` +
`:/system/framework/runtime-library.jar` + `PCL[/system/framework/runtime-library.jar]#` +
`:/system/framework/bar.jar ` `PCL[/system/framework/bar.jar]`
if !strings.Contains(cmd, w) { if !strings.Contains(cmd, w) {
t.Errorf("wanted %q in %q", w, cmd) t.Errorf("wanted %q in %q", w, cmd)
} }
// Test conditional context for target SDK version 28. // Test conditional context for target SDK version 28.
if w := `--target-classpath-for-sdk 28` + if w := `--target-context-for-sdk 28` +
` /system/framework/org.apache.http.legacy.jar `; !strings.Contains(cmd, w) { ` PCL[/system/framework/org.apache.http.legacy.jar] `; !strings.Contains(cmd, w) {
t.Errorf("wanted %q in %q", w, cmd) t.Errorf("wanted %q in %q", w, cmd)
} }
// Test conditional context for target SDK version 29. // Test conditional context for target SDK version 29.
if w := `--target-classpath-for-sdk 29` + // Hardcoded dependency "android.hidl.manager" -> "android.hidl.base" is present.
` /system/framework/android.hidl.base-V1.0-java.jar` + if w := `--target-context-for-sdk 29` +
`:/system/framework/android.hidl.manager-V1.0-java.jar `; !strings.Contains(cmd, w) { ` PCL[/system/framework/android.hidl.base-V1.0-java.jar]` +
`#PCL[/system/framework/android.hidl.manager-V1.0-java.jar]{PCL[/system/framework/android.hidl.base-V1.0-java.jar]} `; !strings.Contains(cmd, w) {
t.Errorf("wanted %q in %q", w, cmd) t.Errorf("wanted %q in %q", w, cmd)
} }
// Test conditional context for target SDK version 30. // Test conditional context for target SDK version 30.
// "android.test.mock" is absent because "android.test.runner" is not used. // "android.test.mock" is absent because "android.test.runner" is not used.
if w := `--target-classpath-for-sdk 30` + if w := `--target-context-for-sdk 30` +
` /system/framework/android.test.base.jar `; !strings.Contains(cmd, w) { ` PCL[/system/framework/android.test.base.jar] `; !strings.Contains(cmd, w) {
t.Errorf("wanted %q in %q", w, cmd) t.Errorf("wanted %q in %q", w, cmd)
} }
cmd = prebuilt.Rule("dexpreopt").RuleParams.Command cmd = prebuilt.Rule("dexpreopt").RuleParams.Command
if w := `--target-classpath-for-sdk any` + if w := `--target-context-for-sdk any` +
` /system/framework/foo.jar` + ` PCL[/system/framework/foo.jar]` +
`:/system/framework/android.test.runner.jar` + `#PCL[/system/framework/android.test.runner.jar]` +
`:/system/framework/bar.jar `; !strings.Contains(cmd, w) { `#PCL[/system/framework/bar.jar] `; !strings.Contains(cmd, w) {
t.Errorf("wanted %q in %q", w, cmd) t.Errorf("wanted %q in %q", w, cmd)
} }
// Test conditional context for target SDK version 30. // Test conditional context for target SDK version 30.
// "android.test.mock" is present because "android.test.runner" is used. // "android.test.mock" is present because "android.test.runner" is used.
if w := `--target-classpath-for-sdk 30` + if w := `--target-context-for-sdk 30` +
` /system/framework/android.test.base.jar` + ` PCL[/system/framework/android.test.base.jar]` +
`:/system/framework/android.test.mock.jar `; !strings.Contains(cmd, w) { `#PCL[/system/framework/android.test.mock.jar] `; !strings.Contains(cmd, w) {
t.Errorf("wanted %q in %q", w, cmd) t.Errorf("wanted %q in %q", w, cmd)
} }
} }

43
scripts/construct_context.py
View File

@@ -29,41 +29,32 @@ def parse_args(args):
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument('--target-sdk-version', default='', dest='sdk', parser.add_argument('--target-sdk-version', default='', dest='sdk',
help='specify target SDK version (as it appears in the manifest)') help='specify target SDK version (as it appears in the manifest)')
parser.add_argument('--host-classpath-for-sdk', dest='host_classpaths', parser.add_argument('--host-context-for-sdk', dest='host_contexts',
action='append', nargs=2, metavar=('sdk','classpath'), action='append', nargs=2, metavar=('sdk','context'),
help='specify classpath on host for a given SDK version or "any" version') help='specify context on host for a given SDK version or "any" version')
parser.add_argument('--target-classpath-for-sdk', dest='target_classpaths', parser.add_argument('--target-context-for-sdk', dest='target_contexts',
action='append', nargs=2, metavar=('sdk','classpath'), action='append', nargs=2, metavar=('sdk','context'),
help='specify classpath on target for a given SDK version or "any" version') help='specify context on target for a given SDK version or "any" version')
return parser.parse_args(args) return parser.parse_args(args)
# The hidl.manager shared library has a dependency on hidl.base. We manually # Special keyword that means that the context should be added to class loader
# add that information to the class loader context if we see those libraries.
HIDL_MANAGER = 'android.hidl.manager-V1.0-java'
HIDL_BASE = 'android.hidl.base-V1.0-java'
# Special keyword that means that the classpath should be added to class loader
# context regardless of the target SDK version. # context regardless of the target SDK version.
any_sdk = 'any' any_sdk = 'any'
# We assume that the order of classpath arguments passed to this script is # We assume that the order of context arguments passed to this script is
# correct (matches the order computed by package manager). It is possible to # correct (matches the order computed by package manager). It is possible to
# sort them here, but Soong needs to use deterministic order anyway, so it can # sort them here, but Soong needs to use deterministic order anyway, so it can
# as well use the correct order. # as well use the correct order.
def construct_context(versioned_classpaths, target_sdk): def construct_context(versioned_contexts, target_sdk):
context = [] context = []
for [sdk, classpath] in versioned_classpaths: for [sdk, ctx] in versioned_contexts:
if sdk == any_sdk or compare_version_gt(sdk, target_sdk): if sdk == any_sdk or compare_version_gt(sdk, target_sdk):
for jar in classpath.split(':'): context.append(ctx)
pcl = 'PCL[%s]' % jar
if HIDL_MANAGER in jar:
pcl += '{PCL[%s]}' % jar.replace(HIDL_MANAGER, HIDL_BASE, 1)
context.append(pcl)
return context return context
def construct_contexts(args): def construct_contexts(args):
host_context = construct_context(args.host_classpaths, args.sdk) host_context = construct_context(args.host_contexts, args.sdk)
target_context = construct_context(args.target_classpaths, args.sdk) target_context = construct_context(args.target_contexts, args.sdk)
context_sep = '#' context_sep = '#'
return ('class_loader_context_arg=--class-loader-context=PCL[]{%s} ; ' % context_sep.join(host_context) + return ('class_loader_context_arg=--class-loader-context=PCL[]{%s} ; ' % context_sep.join(host_context) +
'stored_class_loader_context_arg=--stored-class-loader-context=PCL[]{%s}' % context_sep.join(target_context)) 'stored_class_loader_context_arg=--stored-class-loader-context=PCL[]{%s}' % context_sep.join(target_context))
@@ -74,10 +65,10 @@ def main():
args = parse_args(sys.argv[1:]) args = parse_args(sys.argv[1:])
if not args.sdk: if not args.sdk:
raise SystemExit('target sdk version is not set') raise SystemExit('target sdk version is not set')
if not args.host_classpaths: if not args.host_contexts:
raise SystemExit('host classpath is not set') raise SystemExit('host context is not set')
if not args.target_classpaths: if not args.target_contexts:
raise SystemExit('target classpath is not set') raise SystemExit('target context is not set')
print(construct_contexts(args)) print(construct_contexts(args))

26
scripts/construct_context_test.py
View File

@@ -27,53 +27,47 @@ def construct_contexts(arglist):
args = cc.parse_args(arglist) args = cc.parse_args(arglist)
return cc.construct_contexts(args) return cc.construct_contexts(args)
classpaths = [ contexts = [
'--host-classpath-for-sdk', '28', 'out/zdir/z.jar', '--host-context-for-sdk', '28', 'PCL[out/zdir/z.jar]',
'--target-classpath-for-sdk', '28', '/system/z.jar', '--target-context-for-sdk', '28', 'PCL[/system/z.jar]',
'--host-classpath-for-sdk', '29', 'out/xdir/x.jar:out/ydir/y.jar', '--host-context-for-sdk', '29', 'PCL[out/xdir/x.jar]#PCL[out/ydir/y.jar]',
'--target-classpath-for-sdk', '29', '/system/x.jar:/product/y.jar', '--target-context-for-sdk', '29', 'PCL[/system/x.jar]#PCL[/product/y.jar]',
'--host-classpath-for-sdk', 'any', 'out/adir/a.jar:out/android.hidl.manager-V1.0-java.jar:out/bdir/b.jar', '--host-context-for-sdk', 'any', 'PCL[out/adir/a.jar]#PCL[out/bdir/b.jar]',
'--target-classpath-for-sdk', 'any', '/system/a.jar:/system/android.hidl.manager-V1.0-java.jar:/product/b.jar', '--target-context-for-sdk', 'any', 'PCL[/system/a.jar]#PCL[/product/b.jar]',
] ]
class ConstructContextTest(unittest.TestCase): class ConstructContextTest(unittest.TestCase):
def test_construct_context_28(self): def test_construct_context_28(self):
args = ['--target-sdk-version', '28'] + classpaths args = ['--target-sdk-version', '28'] + contexts
result = construct_contexts(args) result = construct_contexts(args)
expect = ('class_loader_context_arg=--class-loader-context=PCL[]{PCL[out/xdir/x.jar]' expect = ('class_loader_context_arg=--class-loader-context=PCL[]{PCL[out/xdir/x.jar]'
'#PCL[out/ydir/y.jar]' '#PCL[out/ydir/y.jar]'
'#PCL[out/adir/a.jar]' '#PCL[out/adir/a.jar]'
'#PCL[out/android.hidl.manager-V1.0-java.jar]{PCL[out/android.hidl.base-V1.0-java.jar]}'
'#PCL[out/bdir/b.jar]}' '#PCL[out/bdir/b.jar]}'
' ; ' ' ; '
'stored_class_loader_context_arg=--stored-class-loader-context=PCL[]{PCL[/system/x.jar]' 'stored_class_loader_context_arg=--stored-class-loader-context=PCL[]{PCL[/system/x.jar]'
'#PCL[/product/y.jar]' '#PCL[/product/y.jar]'
'#PCL[/system/a.jar]' '#PCL[/system/a.jar]'
'#PCL[/system/android.hidl.manager-V1.0-java.jar]{PCL[/system/android.hidl.base-V1.0-java.jar]}'
'#PCL[/product/b.jar]}') '#PCL[/product/b.jar]}')
self.assertEqual(result, expect) self.assertEqual(result, expect)
def test_construct_context_29(self): def test_construct_context_29(self):
args = ['--target-sdk-version', '29'] + classpaths args = ['--target-sdk-version', '29'] + contexts
result = construct_contexts(args) result = construct_contexts(args)
expect = ('class_loader_context_arg=--class-loader-context=PCL[]{PCL[out/adir/a.jar]' expect = ('class_loader_context_arg=--class-loader-context=PCL[]{PCL[out/adir/a.jar]'
'#PCL[out/android.hidl.manager-V1.0-java.jar]{PCL[out/android.hidl.base-V1.0-java.jar]}'
'#PCL[out/bdir/b.jar]}' '#PCL[out/bdir/b.jar]}'
' ; ' ' ; '
'stored_class_loader_context_arg=--stored-class-loader-context=PCL[]{PCL[/system/a.jar]' 'stored_class_loader_context_arg=--stored-class-loader-context=PCL[]{PCL[/system/a.jar]'
'#PCL[/system/android.hidl.manager-V1.0-java.jar]{PCL[/system/android.hidl.base-V1.0-java.jar]}'
'#PCL[/product/b.jar]}') '#PCL[/product/b.jar]}')
self.assertEqual(result, expect) self.assertEqual(result, expect)
def test_construct_context_S(self): def test_construct_context_S(self):
args = ['--target-sdk-version', 'S'] + classpaths args = ['--target-sdk-version', 'S'] + contexts
result = construct_contexts(args) result = construct_contexts(args)
expect = ('class_loader_context_arg=--class-loader-context=PCL[]{PCL[out/adir/a.jar]' expect = ('class_loader_context_arg=--class-loader-context=PCL[]{PCL[out/adir/a.jar]'
'#PCL[out/android.hidl.manager-V1.0-java.jar]{PCL[out/android.hidl.base-V1.0-java.jar]}'
'#PCL[out/bdir/b.jar]}' '#PCL[out/bdir/b.jar]}'
' ; ' ' ; '
'stored_class_loader_context_arg=--stored-class-loader-context=PCL[]{PCL[/system/a.jar]' 'stored_class_loader_context_arg=--stored-class-loader-context=PCL[]{PCL[/system/a.jar]'
'#PCL[/system/android.hidl.manager-V1.0-java.jar]{PCL[/system/android.hidl.base-V1.0-java.jar]}'
'#PCL[/product/b.jar]}') '#PCL[/product/b.jar]}')
self.assertEqual(result, expect) self.assertEqual(result, expect)