diff options
| -rw-r--r-- | aconfig/rust_aconfig_library_test.go | 4 | ||||
| -rw-r--r-- | java/base.go | 4 | ||||
| -rw-r--r-- | java/kotlin.go | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/aconfig/rust_aconfig_library_test.go b/aconfig/rust_aconfig_library_test.go index 17385c3d1..90b09c814 100644 --- a/aconfig/rust_aconfig_library_test.go +++ b/aconfig/rust_aconfig_library_test.go @@ -50,11 +50,11 @@ func TestRustAconfigLibrary(t *testing.T) { } for _, variant := range variants { - android.AssertStringEquals( + android.AssertStringListContains( t, "dylib variant builds from generated rust code", + variant.Rule("rustc").Implicits.RelativeToTop().Strings(), "out/soong/.intermediates/libmy_rust_aconfig_library/android_arm64_armv8-a_source/gen/src/lib.rs", - variant.Rule("rustc").Inputs[0].RelativeToTop().String(), ) } } diff --git a/java/base.go b/java/base.go index a007717dc..a110aff56 100644 --- a/java/base.go +++ b/java/base.go @@ -1077,8 +1077,8 @@ func (j *Module) AddJSONData(d *map[string]interface{}) { } -func (module *Module) addGeneratedSrcJars(path android.Path) { - module.properties.Generated_srcjars = append(module.properties.Generated_srcjars, path) +func (j *Module) addGeneratedSrcJars(path android.Path) { + j.properties.Generated_srcjars = append(j.properties.Generated_srcjars, path) } func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspathJars, extraCombinedJars android.Paths) { diff --git a/java/kotlin.go b/java/kotlin.go index 3637e2e71..aa2db0ecd 100644 --- a/java/kotlin.go +++ b/java/kotlin.go @@ -145,7 +145,7 @@ var kaptStubs = pctx.AndroidRemoteStaticRule("kaptStubs", android.RemoteRuleSupp `$kaptProcessorPath ` + `$kaptProcessor ` + `-Xbuild-file=$kotlinBuildFile && ` + - `${config.SoongZipCmd} -jar -o $out -C $kaptDir/stubs -D $kaptDir/stubs && ` + + `${config.SoongZipCmd} -jar -write_if_changed -o $out -C $kaptDir/stubs -D $kaptDir/stubs && ` + `rm -rf "$srcJarDir"`, CommandDeps: []string{ "${config.KotlincCmd}", @@ -157,6 +157,7 @@ var kaptStubs = pctx.AndroidRemoteStaticRule("kaptStubs", android.RemoteRuleSupp }, Rspfile: "$out.rsp", RspfileContent: `$in`, + Restat: true, }, "kotlincFlags", "encodedJavacFlags", "kaptProcessorPath", "kaptProcessor", "classpath", "srcJars", "commonSrcFilesArg", "srcJarDir", "kaptDir", "kotlinJvmTarget", |