diff options
| author | 2025-02-20 15:45:57 -0800 | |
|---|---|---|
| committer | 2025-02-20 15:45:57 -0800 | |
| commit | 3bc95fe5fea237dfd88b6810fac84185288d98f8 (patch) | |
| tree | 007b9a039e45feef016456d82e3e5816dd277098 /java/java.go | |
| parent | 94ca16f5bd8c09c8383f60171ae93b3f2a41f137 (diff) | |
| parent | dc95088864cfb5cc3df880c7ab1899459e8735b0 (diff) | |
Merge "Remove RELEASE_USE_TRANSITIVE_JARS_IN_CLASSPATH" into main am: 646e843e91 am: dc95088864
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3502196
Change-Id: I823974fc71fdf574bb677296d358d11c4cbd7d7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/java/java.go b/java/java.go index 45e55d53c..b9109ee94 100644 --- a/java/java.go +++ b/java/java.go @@ -3072,12 +3072,7 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) { // file of the module to be named jarName. var outputFile android.Path combinedImplementationJar := android.PathForModuleOut(ctx, "combined", jarName) - var implementationJars android.Paths - if ctx.Config().UseTransitiveJarsInClasspath() { - implementationJars = completeStaticLibsImplementationJars.ToList() - } else { - implementationJars = append(slices.Clone(localJars), staticJars...) - } + implementationJars := completeStaticLibsImplementationJars.ToList() TransformJarsToJar(ctx, combinedImplementationJar, "combine prebuilt implementation jars", implementationJars, android.OptionalPath{}, false, j.properties.Exclude_files, j.properties.Exclude_dirs) outputFile = combinedImplementationJar @@ -3100,12 +3095,7 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) { if reuseImplementationJarAsHeaderJar { headerJar = outputFile } else { - var headerJars android.Paths - if ctx.Config().UseTransitiveJarsInClasspath() { - headerJars = completeStaticLibsHeaderJars.ToList() - } else { - headerJars = append(slices.Clone(localJars), staticHeaderJars...) - } + headerJars := completeStaticLibsHeaderJars.ToList() headerOutputFile := android.PathForModuleOut(ctx, "turbine-combined", jarName) TransformJarsToJar(ctx, headerOutputFile, "combine prebuilt header jars", headerJars, android.OptionalPath{}, false, j.properties.Exclude_files, j.properties.Exclude_dirs) @@ -3169,11 +3159,7 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) { j.exportAidlIncludeDirs = android.PathsForModuleSrc(ctx, j.properties.Aidl.Export_include_dirs) - if ctx.Config().UseTransitiveJarsInClasspath() { - ctx.CheckbuildFile(localJars...) - } else { - ctx.CheckbuildFile(outputFile) - } + ctx.CheckbuildFile(localJars...) if ctx.Device() { // Shared libraries deapexed from prebuilt apexes are no longer supported. |