Merge "Stop using '&' for class loader context."
This commit is contained in:
commit
b4f9d5c837
|
@ -288,12 +288,9 @@ func dexpreoptCommand(ctx android.PathContext, globalSoong *GlobalSoongConfig, g
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// Other libraries or APKs for which the exact <uses-library> list is unknown.
|
// Other libraries or APKs for which the exact <uses-library> list is unknown.
|
||||||
// Pass special class loader context to skip the classpath and collision check.
|
// We assume the class loader context is empty.
|
||||||
// This will get removed once LOCAL_USES_LIBRARIES is enforced.
|
|
||||||
// Right now LOCAL_USES_LIBRARIES is opt in, for the case where it's not specified we still default
|
|
||||||
// to the &.
|
|
||||||
rule.Command().
|
rule.Command().
|
||||||
Text(`class_loader_context_arg=--class-loader-context=\&`).
|
Text(`class_loader_context_arg=--class-loader-context=PCL[]`).
|
||||||
Text(`stored_class_loader_context_arg=""`)
|
Text(`stored_class_loader_context_arg=""`)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue