diff options
| author | 2019-11-21 12:36:53 -0800 | |
|---|---|---|
| committer | 2019-11-22 12:47:11 -0800 | |
| commit | 9b51a4078a80b815a888c0846c76cf9e21b0196a (patch) | |
| tree | dd84b817afdd07e201c7352d12fb2ca5a57e2d86 /dexpreopt/config.go | |
| parent | 126c57b52d93fc8c86ae438a9fb39ad704b38479 (diff) | |
soong: Support system_server jars from apexes
Allow system_server jars delivered via apex. Regular system_server
jars are located in /system/framework folder. But, jars delivered via
apex are mounted at /apex/<module_name>/javalib.
Bug: 144722612
Bug: 141785760
Test: Compiles
Change-Id: Ia40bb91d2e05b2601a52eac28a985fe2d8da3481
Diffstat (limited to 'dexpreopt/config.go')
| -rw-r--r-- | dexpreopt/config.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/dexpreopt/config.go b/dexpreopt/config.go index 9215eff3f..f38d89297 100644 --- a/dexpreopt/config.go +++ b/dexpreopt/config.go @@ -44,9 +44,10 @@ type GlobalConfig struct { ProductUpdatableBootModules []string ProductUpdatableBootLocations []string - SystemServerJars []string // jars that form the system server - SystemServerApps []string // apps that are loaded into system server - SpeedApps []string // apps that should be speed optimized + SystemServerJars []string // jars that form the system server + SystemServerApps []string // apps that are loaded into system server + UpdatableSystemServerJars []string // jars within apex that are loaded into system server + SpeedApps []string // apps that should be speed optimized PreoptFlags []string // global dex2oat flags that should be used if no module-specific dex2oat flags are specified @@ -285,6 +286,7 @@ func GlobalConfigForTests(ctx android.PathContext) GlobalConfig { ProductUpdatableBootLocations: nil, SystemServerJars: nil, SystemServerApps: nil, + UpdatableSystemServerJars: nil, SpeedApps: nil, PreoptFlags: nil, DefaultCompilerFilter: "", |