Revert submission 9940985-qpr1-dev merge

Reason for revert: broke tests b/146476630
Bug: 146476630
Reverted Changes:

Change-Id: I48c73bcb0819f7cb4c41834cdd680e9e6c323be7
Exclude all builds containing Colin's original change
Meged-In: f0f2e2cf79558569c227e8d96a784d9c0679814a

3 files changed, 1 insertions, 45 deletions

diff --git a/Android.bp b/Android.bp
index 2f5343e4..2692b1be 100644
--- a/Android.bp
+++ b/Android.bp
@@ -281,7 +281,6 @@ bootstrap_go_package {
         "java/support_libraries.go",
         "java/system_modules.go",
         "java/testing.go",
-        "java/tradefed.go",
     ],
     testSrcs: [
         "java/app_test.go",
diff --git a/java/java.go b/java/java.go
index 6bfdfeee..9ac38c92 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1453,8 +1453,6 @@ func (j *Module) CompilerDeps() []string {
 
 type Library struct {
 	Module
-
-	InstallMixin func(ctx android.ModuleContext, installPath android.Path) (extraInstallDeps android.Paths)
 }
 
 func shouldUncompressDex(ctx android.ModuleContext, dexpreopter *dexpreopter) bool {
@@ -1484,12 +1482,8 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) {
 	j.compile(ctx)
 
 	if (Bool(j.properties.Installable) || ctx.Host()) && !android.DirectlyInAnyApex(ctx, ctx.ModuleName()) {
-		var extraInstallDeps android.Paths
-		if j.InstallMixin != nil {
-			extraInstallDeps = j.InstallMixin(ctx, j.outputFile)
-		}
 		j.installFile = ctx.InstallFile(android.PathForModuleInstall(ctx, "framework"),
-			ctx.ModuleName()+".jar", j.outputFile, extraInstallDeps...)
+			ctx.ModuleName()+".jar", j.outputFile)
 	}
 }
 
diff --git a/java/tradefed.go b/java/tradefed.go
deleted file mode 100644
index ebbdec13..00000000
--- a/java/tradefed.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2019 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package java
-
-import (
-	"android/soong/android"
-)
-
-func init() {
-	android.RegisterModuleType("tradefed_java_library_host", tradefedJavaLibraryFactory)
-}
-
-// tradefed_java_library_factory wraps java_library and installs an additional
-// copy of the output jar to $HOST_OUT/tradefed.
-func tradefedJavaLibraryFactory() android.Module {
-	module := LibraryHostFactory().(*Library)
-	module.InstallMixin = tradefedJavaLibraryInstall
-	return module
-}
-
-func tradefedJavaLibraryInstall(ctx android.ModuleContext, path android.Path) android.Paths {
-	installedPath := ctx.InstallFile(android.PathForModuleInstall(ctx, "tradefed"),
-		ctx.ModuleName()+".jar", path)
-	return android.Paths{installedPath}
-}