diff options
| author | Colin Cross <ccross@android.com> | 2017-11-22 16:19:37 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-11-29 05:05:07 +0000 |
| commit | 3bc7ffa59b8277b3a36eb9e16192583b3b9a93ea (patch) | |
| tree | 1a768f402d17a3181a18177e17935dbd1d3c60b2 /java/config | |
| parent | 0875c52de753b858b74a9ac285626536bee9cb57 (diff) | |
| download | build_soong-3bc7ffa59b8277b3a36eb9e16192583b3b9a93ea.tar.gz build_soong-3bc7ffa59b8277b3a36eb9e16192583b3b9a93ea.tar.bz2 build_soong-3bc7ffa59b8277b3a36eb9e16192583b3b9a93ea.zip | |
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
Diffstat (limited to 'java/config')
| -rw-r--r-- | java/config/config.go | 18 |
1 files changed, 18 insertions, 0 deletions
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") } |