diff options
author | Colin Cross <ccross@android.com> | 2016-10-12 14:38:15 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2016-10-12 15:33:33 -0700 |
commit | 1e676bef94d84d8800a23b8ed897b24a157173cd (patch) | |
tree | 8e22d852a05b65925a0b696dd54d528aae7aae3b /java | |
parent | 798bfce9d00217716eaee2256878db625b9e6e2e (diff) | |
download | build_soong-1e676bef94d84d8800a23b8ed897b24a157173cd.tar.gz build_soong-1e676bef94d84d8800a23b8ed897b24a157173cd.tar.bz2 build_soong-1e676bef94d84d8800a23b8ed897b24a157173cd.zip |
Control mutator order
Register mutators inside lambdas that are called in a defined order to
correctly order mutators before and after the arch and deps mutators.
Test: build.ninja identical
Change-Id: Iefe2a3515aee8570e76a6e76925db4cda0e9e822
Diffstat (limited to 'java')
-rw-r--r-- | java/java.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go index 808e1db3..689fe753 100644 --- a/java/java.go +++ b/java/java.go @@ -190,7 +190,7 @@ func (j *javaBase) BootClasspath(ctx android.BaseContext) string { var defaultJavaLibraries = []string{"core-libart", "core-junit", "ext", "framework"} -func javaDepsMutator(ctx android.BottomUpMutatorContext) { +func (j *javaBase) DepsMutator(ctx android.BottomUpMutatorContext) { if j, ok := ctx.Module().(JavaModuleType); ok { ctx.AddDependency(ctx.Module(), nil, j.JavaDependencies(ctx)...) } @@ -513,6 +513,9 @@ type JavaPrebuilt struct { classJarSpecs, resourceJarSpecs []jarSpec } +func (j *JavaPrebuilt) DepsMutator(ctx android.BottomUpMutatorContext) { +} + func (j *JavaPrebuilt) GenerateAndroidBuildActions(ctx android.ModuleContext) { if len(j.properties.Srcs) != 1 { ctx.ModuleErrorf("expected exactly one jar in srcs") |