Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b81e98d authored by Kimberly Kreider's avatar Kimberly Kreider
Browse files

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: f0f2e2cf
parent 4ba82c94

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -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",

java/java.go

+1 −7
Original line number Diff line number Diff line
@@ -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)

	}

}

java/tradefed.go

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
// 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}

}