Snap for 6091187 from 93567935fd147a7a0086fd94594ccf113953bfd8 to qt-qpr2-release
Change-Id: I57cb782c31c177ed6c08ba0b308b3f55c4eafc66
diff --git a/Android.bp b/Android.bp
index 2f5343e..2692b1b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -281,7 +281,6 @@
"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 6bfdfee..9ac38c9 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1453,8 +1453,6 @@
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 @@
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 ebbdec1..0000000
--- 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}
-}
