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

Merge "Stop using '&' for class loader context." am: b4f9d5c837

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58460a59909565d2986634097674a5792843f9c8
This commit is contained in:
Nicolas Geoffray
2021-03-08 11:57:10 +00:00
committed by Automerger Merge Worker
parent 1965f831da b4f9d5c837
commit 1841eee637
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dexpreopt/dexpreopt.go
View File

@@ -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=""`)
} }