From 620680516d86c72e85ce05de104849bd48e8f9af Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Wed, 25 Nov 2020 22:57:23 +0000 Subject: Remove redundant setting of DistFiles by java.Library A previous change handles dist properties automatically for all module types and as a result has made the java.Library setting of DistFiles redundant so this change removes that and the tests that duplicate tests of the general mechanism. Test: m nothing m dist sdk - before and after this change, compare result to make sure that there are no significant differences. Bug: 174226317 Change-Id: Ib79a3bdd46897efd84a9c456c37c374bd6036303 --- java/java.go | 4 ---- 1 file changed, 4 deletions(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index 42fb95574..8738e00cf 100644 --- a/java/java.go +++ b/java/java.go @@ -456,8 +456,6 @@ type Module struct { // list of the xref extraction files kytheFiles android.Paths - distFiles android.TaggedDistFiles - // Collect the module directory for IDE info in java/jdeps.go. modulePaths []string @@ -2114,8 +2112,6 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) { if lib := proptools.String(j.usesLibraryProperties.Provides_uses_lib); lib != "" { j.classLoaderContexts.AddContext(ctx, lib, j.DexJarBuildPath(), j.DexJarInstallPath()) } - - j.distFiles = j.GenerateTaggedDistFiles(ctx) } func (j *Library) DepsMutator(ctx android.BottomUpMutatorContext) { -- cgit v1.2.3