diff options
| author | 2024-09-04 17:15:12 +0000 | |
|---|---|---|
| committer | 2024-09-04 17:15:12 +0000 | |
| commit | 5f0561e24d634d2b30c83e32b1952bb32c888354 (patch) | |
| tree | f71b29b7ca4433947dc06ce4e2eccb69634b6c75 /java/base.go | |
| parent | 2b33af39c0a946ece091c3fcd194f8af9a92005d (diff) | |
| parent | ca3bf2be39011ba3f7f0a8b9b471aaaa65046e68 (diff) | |
Merge "Move checkbuild targets of Soong modules into Soong" into main am: ca3bf2be39
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3237626
Change-Id: Id72a093f81785ece92211cc63a73c0a53576fb7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/base.go')
| -rw-r--r-- | java/base.go | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/java/base.go b/java/base.go index 23e0f0674..59dbc2ffa 100644 --- a/java/base.go +++ b/java/base.go @@ -1279,6 +1279,8 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspath } j.headerJarFile = combinedHeaderJarFile + ctx.CheckbuildFile(j.headerJarFile) + android.SetProvider(ctx, JavaInfoProvider, &JavaInfo{ HeaderJars: android.PathsIfNonNil(j.headerJarFile), TransitiveLibsHeaderJars: j.transitiveLibsHeaderJars, @@ -1759,6 +1761,8 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspath j.dexpreopt(ctx, libName, dexOutputFile) outputFile = dexOutputFile + + ctx.CheckbuildFile(dexOutputFile) } else { // There is no code to compile into a dex jar, make sure the resources are propagated // to the APK if this is an app. @@ -1802,7 +1806,8 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspath j.collectTransitiveSrcFiles(ctx, srcFiles) - ctx.CheckbuildFile(outputFile) + ctx.CheckbuildFile(j.implementationJarFile) + ctx.CheckbuildFile(j.headerJarFile) android.SetProvider(ctx, JavaInfoProvider, &JavaInfo{ HeaderJars: android.PathsIfNonNil(j.headerJarFile), @@ -1970,6 +1975,8 @@ func (j *Module) compileJavaHeader(ctx android.ModuleContext, srcFiles, srcJars TransformJarsToJar(ctx, combinedHeaderJarOutputPath, "for turbine", jars, android.OptionalPath{}, false, nil, []string{"META-INF/TRANSITIVE"}) + ctx.CheckbuildFile(combinedHeaderJarOutputPath) + return headerJar, combinedHeaderJarOutputPath } |