diff options
| author | 2019-01-23 21:04:05 +0000 | |
|---|---|---|
| committer | 2019-01-23 22:55:41 +0000 | |
| commit | 91b4e3e78b51b0f177d07255f85d9abaea905d1d (patch) | |
| tree | 06faa6a5a1dbb552a07413b14c65def20cc30d51 /apex/apex.go | |
| parent | c7f797ea545d0c1c079b88743a4a8107a6195611 (diff) | |
Disable all-assigned check in hiddenapi on master-art
Master-art configurations do not have frameworks/base and therefore do
not have hidden API flags. Pass --no-force-assign-all to `hiddenapi`
when frameworks/base does not exist to disable the corresponding
assertion. This enables us to enforce the assertion on non-master-art
builds and also get rid of logspam about missing flags on ART buildbots.
Test: art/tools/buildbot-build.sh on master-art
Bug: 123143676
Change-Id: I074d9554fb11dab3eef904016375730520107ec2
Diffstat (limited to 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apex/apex.go b/apex/apex.go index 160db1c71..0aedb1abc 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -118,7 +118,7 @@ func init() { // projects, and hence cannot built 'aapt2'. Use the SDK prebuilt instead. hostBinToolVariableWithPrebuilt := func(name, prebuiltDir, tool string) { pctx.VariableFunc(name, func(ctx android.PackageVarContext) string { - if !android.ExistentPathForSource(ctx, "frameworks/base").Valid() { + if !ctx.Config().FrameworksBaseDirExists(ctx) { return filepath.Join(prebuiltDir, runtime.GOOS, "bin", tool) } else { return pctx.HostBinToolPath(ctx, tool).String() |