From 3bc7ffa59b8277b3a36eb9e16192583b3b9a93ea Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 22 Nov 2017 16:19:37 -0800 Subject: Replace aapt support with aapt2 Use aapt2 instead of aapt to compile Android app resources. Also generate all files into srcjars instead of individual sources. Test: m checkbuild Change-Id: I5a67991a0daf0017e8159b46fcff7d5564a91468 --- java/config/config.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'java/config') diff --git a/java/config/config.go b/java/config/config.go index 466563f5..603d43fe 100644 --- a/java/config/config.go +++ b/java/config/config.go @@ -15,6 +15,8 @@ package config import ( + "path/filepath" + "runtime" "strings" _ "github.com/google/blueprint/bootstrap" @@ -130,4 +132,20 @@ func init() { }) pctx.HostJavaToolVariable("JacocoCLIJar", "jacoco-cli.jar") + + hostBinToolVariableWithPrebuilt := func(name, prebuiltDir, tool string) { + pctx.VariableFunc(name, func(config android.Config) (string, error) { + if config.UnbundledBuild() || config.IsPdkBuild() { + return filepath.Join(prebuiltDir, runtime.GOOS, "bin", tool), nil + } else { + if path, err := pctx.HostBinToolPath(config, tool); err != nil { + return "", err + } else { + return path.String(), nil + } + } + }) + } + + hostBinToolVariableWithPrebuilt("Aapt2Cmd", "prebuilt/sdk/tools", "aapt2") } -- cgit v1.2.3