diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-01-07 21:38:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-01-07 21:38:16 +0000 |
| commit | e2e13a5d9961b023b3ab183d2a729f7ce68eb95b (patch) | |
| tree | 66814f60acff8d0645655bf1673be15bdae97dc2 /dexpreopt | |
| parent | ef7647f3ea41888f0bc8751d255e2b537264cd5a (diff) | |
| parent | 5de4196079a8ae57429683758927c333dee17a41 (diff) | |
| download | build_soong-e2e13a5d9961b023b3ab183d2a729f7ce68eb95b.tar.gz build_soong-e2e13a5d9961b023b3ab183d2a729f7ce68eb95b.tar.bz2 build_soong-e2e13a5d9961b023b3ab183d2a729f7ce68eb95b.zip | |
Merge "Save invocation info of dex2oat runs."android-o-mr1-iot-release-1.0.8
Diffstat (limited to 'dexpreopt')
| -rw-r--r-- | dexpreopt/dexpreopt.go | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/dexpreopt/dexpreopt.go b/dexpreopt/dexpreopt.go index 0ea32b86..3b211063 100644 --- a/dexpreopt/dexpreopt.go +++ b/dexpreopt/dexpreopt.go @@ -201,6 +201,8 @@ func dexpreoptCommand(global GlobalConfig, module ModuleConfig, rule *Rule, prof vdexPath := pathtools.ReplaceExtension(odexPath, "vdex") vdexInstallPath := pathtools.ReplaceExtension(odexInstallPath, "vdex") + invocationPath := pathtools.ReplaceExtension(odexPath, "invocation") + // bootImageLocation is $OUT/dex_bootjars/system/framework/boot.art, but dex2oat actually reads // $OUT/dex_bootjars/system/framework/arm64/boot.art var bootImagePath string @@ -265,11 +267,11 @@ func dexpreoptCommand(global GlobalConfig, module ModuleConfig, rule *Rule, prof const hidlManager = "android.hidl.manager-V1.0-java" conditionalClassLoaderContextHost29 = append(conditionalClassLoaderContextHost29, - pathForLibrary(module, hidlManager)) + pathForLibrary(module, hidlManager)) conditionalClassLoaderContextTarget29 = append(conditionalClassLoaderContextTarget29, filepath.Join("/system/framework", hidlManager+".jar")) conditionalClassLoaderContextHost29 = append(conditionalClassLoaderContextHost29, - pathForLibrary(module, hidlBase)) + pathForLibrary(module, hidlBase)) conditionalClassLoaderContextTarget29 = append(conditionalClassLoaderContextTarget29, filepath.Join("/system/framework", hidlBase+".jar")) } else { @@ -291,7 +293,7 @@ func dexpreoptCommand(global GlobalConfig, module ModuleConfig, rule *Rule, prof rule.Command().Textf(`uses_library_names="%s"`, strings.Join(verifyUsesLibs, " ")) rule.Command().Textf(`optional_uses_library_names="%s"`, strings.Join(verifyOptionalUsesLibs, " ")) rule.Command().Textf(`aapt_binary="%s"`, global.Tools.Aapt) - rule.Command().Textf(`dex_preopt_host_libraries="%s"`, strings.Join(classLoaderContextHost, " " )) + rule.Command().Textf(`dex_preopt_host_libraries="%s"`, strings.Join(classLoaderContextHost, " ")) rule.Command().Textf(`dex_preopt_target_libraries="%s"`, strings.Join(classLoaderContextTarget, " ")) rule.Command().Textf(`conditional_host_libs_28="%s"`, strings.Join(conditionalClassLoaderContextHost28, " ")) rule.Command().Textf(`conditional_target_libs_28="%s"`, strings.Join(conditionalClassLoaderContextTarget28, " ")) @@ -305,6 +307,7 @@ func dexpreoptCommand(global GlobalConfig, module ModuleConfig, rule *Rule, prof Text(`ANDROID_LOG_TAGS="*:e"`). Tool(global.Tools.Dex2oat). Flag("--avoid-storing-invocation"). + FlagWithOutput("--write-invocation-to=", invocationPath).ImplicitOutput(invocationPath). Flag("--runtime-arg").FlagWithArg("-Xms", global.Dex2oatXms). Flag("--runtime-arg").FlagWithArg("-Xmx", global.Dex2oatXmx). Flag("${class_loader_context_arg}"). |