diff options
| author | 2021-03-23 17:41:40 -0700 | |
|---|---|---|
| committer | 2021-03-25 11:06:45 -0700 | |
| commit | 7ee54ffd708252e085d17e64c8e89ba9ef19d105 (patch) | |
| tree | 7c5cb994fcaa3edc3e3db9beaf81b5842c0ca6bb /java/droiddoc.go | |
| parent | 5bedfa2d45fe1186485ada0729cac0a86bccfb4e (diff) | |
Replace ANDROID_SDK_HOME with ANDROID_PREFS_ROOT for metalava
Fixes warnings:
Warning: Using ANDROID_SDK_HOME for the location of the '.android' preferences location is deprecated, please use ANDROID_PREFS_ROOT instead.
Support for ANDROID_SDK_HOME is deprecated and will be removed in 6.0
Test: m android_stubs_current
Change-Id: Ie8721dcda0578c670dfc796675ba43cda16883f6
Diffstat (limited to 'java/droiddoc.go')
| -rw-r--r-- | java/droiddoc.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/droiddoc.go b/java/droiddoc.go index 34f017dc5..0becb84e1 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -1209,7 +1209,7 @@ func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersi rule.Command().Text("mkdir -p").Flag(homeDir.String()) cmd := rule.Command() - cmd.FlagWithArg("ANDROID_SDK_HOME=", homeDir.String()) + cmd.FlagWithArg("ANDROID_PREFS_ROOT=", homeDir.String()) if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_METALAVA") { rule.Remoteable(android.RemoteRuleSupports{RBE: true}) @@ -1234,7 +1234,7 @@ func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersi RSPFiles: []string{implicitsRsp.String()}, ToolchainInputs: []string{config.JavaCmd(ctx).String()}, Platform: map[string]string{remoteexec.PoolKey: pool}, - EnvironmentVariables: []string{"ANDROID_SDK_HOME"}, + EnvironmentVariables: []string{"ANDROID_PREFS_ROOT"}, }).NoVarTemplate(ctx.Config().RBEWrapper())) } |