From 91b4e3e78b51b0f177d07255f85d9abaea905d1d Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Wed, 23 Jan 2019 21:04:05 +0000 Subject: 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 --- android/config.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'android/config.go') diff --git a/android/config.go b/android/config.go index 956c4afa2..07d0a87c3 100644 --- a/android/config.go +++ b/android/config.go @@ -774,6 +774,10 @@ func (c *config) DexPreoptProfileDir() string { return String(c.productVariables.DexPreoptProfileDir) } +func (c *config) FrameworksBaseDirExists(ctx PathContext) bool { + return ExistentPathForSource(ctx, "frameworks", "base").Valid() +} + func (c *deviceConfig) Arches() []Arch { var arches []Arch for _, target := range c.config.Targets[Android] { -- cgit v1.2.3-59-g8ed1b