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

Commit 853f5c9e authored by Colin Cross's avatar Colin Cross Committed by Kimberly Kreider
Browse files

DO NOT MERGE: Add tradefed_java_library_host 

Add a module type for tradefed libraries that causes an additional
copy to be installed at out/host/linux-x86/tradefed.

Bug: 143908003
Exclude merging into *-plus-aosp branches, since they already include the change.
Merged-In: I670345494abbad80dacab54471e635abfae3b3b3
Merged-In: I1cb25bbd5823a14f1a9428d58827677eff22ec7e
Change-Id: I55bca53e02588827374896ef87d58f3f4bdc48c7
(cherry picked from commit f0f2e2cf)
(cherry picked from commit cba45b28)
parent 874cbda3

Android.bp

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

+7 −1
Original line number Diff line number Diff line
@@ -1465,6 +1465,8 @@ 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 {
@@ -1494,8 +1496,12 @@ 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)

			ctx.ModuleName()+".jar", j.outputFile, extraInstallDeps...)

	}

}

java/tradefed.go

0 → 100644
+37 −0
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}

}