618922e510
This change fixes a bug that jacoco-report-classes-all.jar does not include info for APK-in-APEX such as the MediaProvider apk in com.android.mediaprovider APEX. Firstly, LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR is correctly set also for the APKs included in APEXes. Secondly, the Make modules for the embedded APKs are now built with soong_app_prebuilt.mk to correctly import the jacoco file into the Make world. Bug: 147296855 Test: execute the following command in internal master. $ choosecombo cf_x86_phone userdebug $ NINJA_ARGS="-t path out/target/product/vsoc_x86/jacoco-report-classes-all.jar out/target/common/obj/ETC/MediaProvider.com.android.mediaprovider_intermediates/jacoco-report-classes.jar" EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true m The result shows that there is a path as follows: out/target/product/vsoc_x86/jacoco-report-classes-all.jar out/target/product/vsoc_x86/apex/com.android.mediaprovider/priv-app/MediaProvider/MediaProvider.apk out/target/product/vsoc_x86/obj/ETC/MediaProvider.com.android.mediaprovider_intermediates/package.apk out/target/common/obj/ETC/MediaProvider.com.android.mediaprovider_intermediates/jacoco-report-classes.jar Change-Id: I52d11534a34eb35219bfafca4453e75a1b701c0e
190 lines
5.7 KiB
Go
190 lines
5.7 KiB
Go
// 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 (
|
|
"fmt"
|
|
"io"
|
|
|
|
"android/soong/android"
|
|
)
|
|
|
|
type DeviceHostConverter struct {
|
|
android.ModuleBase
|
|
android.DefaultableModuleBase
|
|
|
|
properties DeviceHostConverterProperties
|
|
|
|
headerJars android.Paths
|
|
implementationJars android.Paths
|
|
implementationAndResourceJars android.Paths
|
|
resourceJars android.Paths
|
|
|
|
srcJarArgs []string
|
|
srcJarDeps android.Paths
|
|
|
|
combinedHeaderJar android.Path
|
|
combinedImplementationJar android.Path
|
|
}
|
|
|
|
type DeviceHostConverterProperties struct {
|
|
// List of modules whose contents will be visible to modules that depend on this module.
|
|
Libs []string
|
|
}
|
|
|
|
type DeviceForHost struct {
|
|
DeviceHostConverter
|
|
}
|
|
|
|
// java_device_for_host makes the classes.jar output of a device java_library module available to host
|
|
// java_library modules.
|
|
//
|
|
// It is rarely necessary, and its usage is restricted to a few whitelisted projects.
|
|
func DeviceForHostFactory() android.Module {
|
|
module := &DeviceForHost{}
|
|
|
|
module.AddProperties(&module.properties)
|
|
|
|
InitJavaModule(module, android.HostSupported)
|
|
return module
|
|
}
|
|
|
|
type HostForDevice struct {
|
|
DeviceHostConverter
|
|
}
|
|
|
|
// java_host_for_device makes the classes.jar output of a host java_library module available to device
|
|
// java_library modules.
|
|
//
|
|
// It is rarely necessary, and its usage is restricted to a few whitelisted projects.
|
|
func HostForDeviceFactory() android.Module {
|
|
module := &HostForDevice{}
|
|
|
|
module.AddProperties(&module.properties)
|
|
|
|
InitJavaModule(module, android.DeviceSupported)
|
|
return module
|
|
}
|
|
|
|
var deviceHostConverterDepTag = dependencyTag{name: "device_host_converter"}
|
|
|
|
func (d *DeviceForHost) DepsMutator(ctx android.BottomUpMutatorContext) {
|
|
ctx.AddFarVariationDependencies(ctx.Config().AndroidCommonTarget.Variations(),
|
|
deviceHostConverterDepTag, d.properties.Libs...)
|
|
}
|
|
|
|
func (d *HostForDevice) DepsMutator(ctx android.BottomUpMutatorContext) {
|
|
ctx.AddFarVariationDependencies(ctx.Config().BuildOSCommonTarget.Variations(),
|
|
deviceHostConverterDepTag, d.properties.Libs...)
|
|
}
|
|
|
|
func (d *DeviceHostConverter) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
|
if len(d.properties.Libs) < 1 {
|
|
ctx.PropertyErrorf("libs", "at least one dependency is required")
|
|
}
|
|
|
|
ctx.VisitDirectDepsWithTag(deviceHostConverterDepTag, func(m android.Module) {
|
|
if dep, ok := m.(Dependency); ok {
|
|
d.headerJars = append(d.headerJars, dep.HeaderJars()...)
|
|
d.implementationJars = append(d.implementationJars, dep.ImplementationJars()...)
|
|
d.implementationAndResourceJars = append(d.implementationAndResourceJars, dep.ImplementationAndResourcesJars()...)
|
|
d.resourceJars = append(d.resourceJars, dep.ResourceJars()...)
|
|
|
|
srcJarArgs, srcJarDeps := dep.SrcJarArgs()
|
|
d.srcJarArgs = append(d.srcJarArgs, srcJarArgs...)
|
|
d.srcJarDeps = append(d.srcJarDeps, srcJarDeps...)
|
|
} else {
|
|
ctx.PropertyErrorf("libs", "module %q cannot be used as a dependency", ctx.OtherModuleName(m))
|
|
}
|
|
})
|
|
|
|
jarName := ctx.ModuleName() + ".jar"
|
|
|
|
if len(d.implementationAndResourceJars) > 1 {
|
|
outputFile := android.PathForModuleOut(ctx, "combined", jarName)
|
|
TransformJarsToJar(ctx, outputFile, "combine", d.implementationAndResourceJars,
|
|
android.OptionalPath{}, false, nil, nil)
|
|
d.combinedImplementationJar = outputFile
|
|
} else {
|
|
d.combinedImplementationJar = d.implementationAndResourceJars[0]
|
|
}
|
|
|
|
if len(d.headerJars) > 1 {
|
|
outputFile := android.PathForModuleOut(ctx, "turbine-combined", jarName)
|
|
TransformJarsToJar(ctx, outputFile, "turbine combine", d.headerJars,
|
|
android.OptionalPath{}, false, nil, []string{"META-INF/TRANSITIVE"})
|
|
d.combinedHeaderJar = outputFile
|
|
} else {
|
|
d.combinedHeaderJar = d.headerJars[0]
|
|
}
|
|
|
|
}
|
|
|
|
var _ Dependency = (*DeviceHostConverter)(nil)
|
|
|
|
func (d *DeviceHostConverter) HeaderJars() android.Paths {
|
|
return d.headerJars
|
|
}
|
|
|
|
func (d *DeviceHostConverter) ImplementationJars() android.Paths {
|
|
return d.implementationJars
|
|
}
|
|
|
|
func (d *DeviceHostConverter) ResourceJars() android.Paths {
|
|
return d.resourceJars
|
|
}
|
|
|
|
func (d *DeviceHostConverter) ImplementationAndResourcesJars() android.Paths {
|
|
return d.implementationAndResourceJars
|
|
}
|
|
|
|
func (d *DeviceHostConverter) DexJar() android.Path {
|
|
return nil
|
|
}
|
|
|
|
func (d *DeviceHostConverter) AidlIncludeDirs() android.Paths {
|
|
return nil
|
|
}
|
|
|
|
func (d *DeviceHostConverter) ExportedSdkLibs() []string {
|
|
return nil
|
|
}
|
|
|
|
func (d *DeviceHostConverter) ExportedPlugins() (android.Paths, []string) {
|
|
return nil, nil
|
|
}
|
|
|
|
func (d *DeviceHostConverter) SrcJarArgs() ([]string, android.Paths) {
|
|
return d.srcJarArgs, d.srcJarDeps
|
|
}
|
|
|
|
func (d *DeviceHostConverter) JacocoReportClassesFile() android.Path {
|
|
return nil
|
|
}
|
|
|
|
func (d *DeviceHostConverter) AndroidMk() android.AndroidMkData {
|
|
return android.AndroidMkData{
|
|
Class: "JAVA_LIBRARIES",
|
|
OutputFile: android.OptionalPathForPath(d.combinedImplementationJar),
|
|
Include: "$(BUILD_SYSTEM)/soong_java_prebuilt.mk",
|
|
Extra: []android.AndroidMkExtraFunc{
|
|
func(w io.Writer, outputFile android.Path) {
|
|
fmt.Fprintln(w, "LOCAL_UNINSTALLABLE_MODULE := true")
|
|
fmt.Fprintln(w, "LOCAL_SOONG_HEADER_JAR :=", d.combinedHeaderJar.String())
|
|
fmt.Fprintln(w, "LOCAL_SOONG_CLASSES_JAR :=", d.combinedImplementationJar.String())
|
|
},
|
|
},
|
|
}
|
|
}
|