4103e92c4b
Previously, the hiddenapi() method combined both checks to determine whether a module contributed to/was modified by the hiddenapi process and logic to create ninja rules to perform those tasks. This change separates the former out into a new initHiddenAPI() method. The main purpose of this is to simplify the process of allowing the CSV generation to be separated from the encoding. That is required because when a java_import retrieves its dex file from the apex it has already been encoded. The initHiddenAPI() method is only called for java.Library (and indirectly for java.SdkLibrary) and java.Import modules which means that the hiddenapi() method does nothing for any other module type. That is consistent with the previous behaviour because while the hiddenapi() method is called for other module types they fail because the boot image jars only support java_library, java_sdk_library, and java_import at the moment. While it will need to support java_sdk_library_import once any of the libraries that are currently provided as java_sdk_library modules switches to providing prebuilts that is outside the scope of this work. Bug: 178361284 Test: m droid Verified that hiddenapi files (both aggregated ones and for the individual modules) are not affected by this change. Change-Id: Iaa91e0a8e2bffec03296dd894e9662556f4464c0
281 lines
11 KiB
Go
281 lines
11 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 (
|
|
"strings"
|
|
|
|
"github.com/google/blueprint"
|
|
|
|
"android/soong/android"
|
|
)
|
|
|
|
var hiddenAPIGenerateCSVRule = pctx.AndroidStaticRule("hiddenAPIGenerateCSV", blueprint.RuleParams{
|
|
Command: "${config.Class2NonSdkList} --stub-api-flags ${stubAPIFlags} $in $outFlag $out",
|
|
CommandDeps: []string{"${config.Class2NonSdkList}"},
|
|
}, "outFlag", "stubAPIFlags")
|
|
|
|
type hiddenAPI struct {
|
|
// True if the module containing this structure contributes to the hiddenapi information.
|
|
active bool
|
|
|
|
// True if the module only contains additional annotations and so does not require hiddenapi
|
|
// information to be encoded in its dex file and should not be used to generate the
|
|
// hiddenAPISingletonPathsStruct.stubFlags file.
|
|
annotationsOnly bool
|
|
|
|
// The path to the dex jar that is in the boot class path. If this is nil then the associated
|
|
// module is not a boot jar, but could be one of the <x>-hiddenapi modules that provide additional
|
|
// annotations for the <x> boot dex jar but which do not actually provide a boot dex jar
|
|
// themselves.
|
|
//
|
|
// This must be the path to the unencoded dex jar as the encoded dex jar indirectly depends on
|
|
// this file so using the encoded dex jar here would result in a cycle in the ninja rules.
|
|
bootDexJarPath android.Path
|
|
|
|
// The path to the CSV file that contains mappings from Java signature to various flags derived
|
|
// from annotations in the source, e.g. whether it is public or the sdk version above which it
|
|
// can no longer be used.
|
|
//
|
|
// It is created by the Class2NonSdkList tool which processes the .class files in the class
|
|
// implementation jar looking for UnsupportedAppUsage and CovariantReturnType annotations. The
|
|
// tool also consumes the hiddenAPISingletonPathsStruct.stubFlags file in order to perform
|
|
// consistency checks on the information in the annotations and to filter out bridge methods
|
|
// that are already part of the public API.
|
|
flagsCSVPath android.Path
|
|
|
|
// The path to the CSV file that contains mappings from Java signature to the value of properties
|
|
// specified on UnsupportedAppUsage annotations in the source.
|
|
//
|
|
// Like the flagsCSVPath file this is also created by the Class2NonSdkList in the same way.
|
|
// Although the two files could potentially be created in a single invocation of the
|
|
// Class2NonSdkList at the moment they are created using their own invocation, with the behavior
|
|
// being determined by the property that is used.
|
|
metadataCSVPath android.Path
|
|
|
|
// The path to the CSV file that contains mappings from Java signature to source location
|
|
// information.
|
|
//
|
|
// It is created by the merge_csv tool which processes the class implementation jar, extracting
|
|
// all the files ending in .uau (which are CSV files) and merges them together. The .uau files are
|
|
// created by the unsupported app usage annotation processor during compilation of the class
|
|
// implementation jar.
|
|
indexCSVPath android.Path
|
|
}
|
|
|
|
func (h *hiddenAPI) flagsCSV() android.Path {
|
|
return h.flagsCSVPath
|
|
}
|
|
|
|
func (h *hiddenAPI) metadataCSV() android.Path {
|
|
return h.metadataCSVPath
|
|
}
|
|
|
|
func (h *hiddenAPI) bootDexJar() android.Path {
|
|
return h.bootDexJarPath
|
|
}
|
|
|
|
func (h *hiddenAPI) indexCSV() android.Path {
|
|
return h.indexCSVPath
|
|
}
|
|
|
|
type hiddenAPIIntf interface {
|
|
bootDexJar() android.Path
|
|
flagsCSV() android.Path
|
|
indexCSV() android.Path
|
|
metadataCSV() android.Path
|
|
}
|
|
|
|
var _ hiddenAPIIntf = (*hiddenAPI)(nil)
|
|
|
|
// Initialize the hiddenapi structure
|
|
func (h *hiddenAPI) initHiddenAPI(ctx android.BaseModuleContext, name string) {
|
|
// If hiddenapi processing is disabled treat this as inactive.
|
|
if ctx.Config().IsEnvTrue("UNSAFE_DISABLE_HIDDENAPI_FLAGS") {
|
|
return
|
|
}
|
|
|
|
// Modules whose names are of the format <x>-hiddenapi provide hiddenapi information for the boot
|
|
// jar module <x>. Otherwise, the module provides information for itself. Either way extract the
|
|
// name of the boot jar module.
|
|
bootJarName := strings.TrimSuffix(name, "-hiddenapi")
|
|
|
|
// It is important that hiddenapi information is only gathered for/from modules that are actually
|
|
// on the boot jars list because the runtime only enforces access to the hidden API for the
|
|
// bootclassloader. If information is gathered for modules not on the list then that will cause
|
|
// failures in the CtsHiddenApiBlocklist... tests.
|
|
h.active = inList(bootJarName, ctx.Config().BootJars())
|
|
|
|
// If this module has a suffix of -hiddenapi then it only provides additional annotation
|
|
// information for a module on the boot jars list.
|
|
h.annotationsOnly = strings.HasSuffix(name, "-hiddenapi")
|
|
}
|
|
|
|
// hiddenAPI is called by any module that could contribute to the hiddenapi processing.
|
|
//
|
|
// It ignores any module that has not had initHiddenApi() called on it and which is not in the boot
|
|
// jar list.
|
|
//
|
|
// Otherwise, it generates ninja rules to do the following:
|
|
// 1. Generates CSV files needed for hiddenapi processing.
|
|
// 2. Conditionally adds the supplied dex file to the list of files used to generate the
|
|
// hiddenAPISingletonPathsStruct.stubsFlag file.
|
|
// 3. Conditionally creates a copy of the supplied dex file into which it has encoded the hiddenapi
|
|
// flags and returns this instead of the supplied dex jar, otherwise simply returns the supplied
|
|
// dex jar.
|
|
func (h *hiddenAPI) hiddenAPI(ctx android.ModuleContext, name string, primary bool, dexJar android.OutputPath,
|
|
implementationJar android.Path, uncompressDex bool) android.OutputPath {
|
|
|
|
if !h.active {
|
|
return dexJar
|
|
}
|
|
|
|
// More than one library with the same classes may need to be encoded but only one should be
|
|
// used as a source of information for hidden API processing otherwise it will result in
|
|
// duplicate entries in the files.
|
|
if primary {
|
|
// Create ninja rules to generate various CSV files needed by hiddenapi and store the paths
|
|
// in the hiddenAPI structure.
|
|
h.hiddenAPIGenerateCSV(ctx, implementationJar)
|
|
|
|
// Save the unencoded dex jar so it can be used when generating the
|
|
// hiddenAPISingletonPathsStruct.stubFlags file.
|
|
h.bootDexJarPath = dexJar
|
|
}
|
|
|
|
if !h.annotationsOnly {
|
|
hiddenAPIJar := android.PathForModuleOut(ctx, "hiddenapi", name+".jar").OutputPath
|
|
|
|
// Create a copy of the dex jar which has been encoded with hiddenapi flags.
|
|
hiddenAPIEncodeDex(ctx, hiddenAPIJar, dexJar, uncompressDex)
|
|
|
|
// Use the encoded dex jar from here onwards.
|
|
dexJar = hiddenAPIJar
|
|
}
|
|
|
|
return dexJar
|
|
}
|
|
|
|
func (h *hiddenAPI) hiddenAPIGenerateCSV(ctx android.ModuleContext, classesJar android.Path) {
|
|
stubFlagsCSV := hiddenAPISingletonPaths(ctx).stubFlags
|
|
|
|
flagsCSV := android.PathForModuleOut(ctx, "hiddenapi", "flags.csv")
|
|
ctx.Build(pctx, android.BuildParams{
|
|
Rule: hiddenAPIGenerateCSVRule,
|
|
Description: "hiddenapi flags",
|
|
Input: classesJar,
|
|
Output: flagsCSV,
|
|
Implicit: stubFlagsCSV,
|
|
Args: map[string]string{
|
|
"outFlag": "--write-flags-csv",
|
|
"stubAPIFlags": stubFlagsCSV.String(),
|
|
},
|
|
})
|
|
h.flagsCSVPath = flagsCSV
|
|
|
|
metadataCSV := android.PathForModuleOut(ctx, "hiddenapi", "metadata.csv")
|
|
ctx.Build(pctx, android.BuildParams{
|
|
Rule: hiddenAPIGenerateCSVRule,
|
|
Description: "hiddenapi metadata",
|
|
Input: classesJar,
|
|
Output: metadataCSV,
|
|
Implicit: stubFlagsCSV,
|
|
Args: map[string]string{
|
|
"outFlag": "--write-metadata-csv",
|
|
"stubAPIFlags": stubFlagsCSV.String(),
|
|
},
|
|
})
|
|
h.metadataCSVPath = metadataCSV
|
|
|
|
indexCSV := android.PathForModuleOut(ctx, "hiddenapi", "index.csv")
|
|
rule := android.NewRuleBuilder(pctx, ctx)
|
|
rule.Command().
|
|
BuiltTool("merge_csv").
|
|
FlagWithInput("--zip_input=", classesJar).
|
|
FlagWithOutput("--output=", indexCSV)
|
|
rule.Build("merged-hiddenapi-index", "Merged Hidden API index")
|
|
h.indexCSVPath = indexCSV
|
|
}
|
|
|
|
var hiddenAPIEncodeDexRule = pctx.AndroidStaticRule("hiddenAPIEncodeDex", blueprint.RuleParams{
|
|
Command: `rm -rf $tmpDir && mkdir -p $tmpDir && mkdir $tmpDir/dex-input && mkdir $tmpDir/dex-output &&
|
|
unzip -qoDD $in 'classes*.dex' -d $tmpDir/dex-input &&
|
|
for INPUT_DEX in $$(find $tmpDir/dex-input -maxdepth 1 -name 'classes*.dex' | sort); do
|
|
echo "--input-dex=$${INPUT_DEX}";
|
|
echo "--output-dex=$tmpDir/dex-output/$$(basename $${INPUT_DEX})";
|
|
done | xargs ${config.HiddenAPI} encode --api-flags=$flagsCsv $hiddenapiFlags &&
|
|
${config.SoongZipCmd} $soongZipFlags -o $tmpDir/dex.jar -C $tmpDir/dex-output -f "$tmpDir/dex-output/classes*.dex" &&
|
|
${config.MergeZipsCmd} -D -zipToNotStrip $tmpDir/dex.jar -stripFile "classes*.dex" -stripFile "**/*.uau" $out $tmpDir/dex.jar $in`,
|
|
CommandDeps: []string{
|
|
"${config.HiddenAPI}",
|
|
"${config.SoongZipCmd}",
|
|
"${config.MergeZipsCmd}",
|
|
},
|
|
}, "flagsCsv", "hiddenapiFlags", "tmpDir", "soongZipFlags")
|
|
|
|
func hiddenAPIEncodeDex(ctx android.ModuleContext, output android.WritablePath, dexInput android.Path,
|
|
uncompressDex bool) {
|
|
|
|
flagsCSV := hiddenAPISingletonPaths(ctx).flags
|
|
|
|
// The encode dex rule requires unzipping and rezipping the classes.dex files, ensure that if it was uncompressed
|
|
// in the input it stays uncompressed in the output.
|
|
soongZipFlags := ""
|
|
hiddenapiFlags := ""
|
|
tmpOutput := output
|
|
tmpDir := android.PathForModuleOut(ctx, "hiddenapi", "dex")
|
|
if uncompressDex {
|
|
soongZipFlags = "-L 0"
|
|
tmpOutput = android.PathForModuleOut(ctx, "hiddenapi", "unaligned", "unaligned.jar")
|
|
tmpDir = android.PathForModuleOut(ctx, "hiddenapi", "unaligned")
|
|
}
|
|
|
|
enforceHiddenApiFlagsToAllMembers := true
|
|
// If frameworks/base doesn't exist we must be building with the 'master-art' manifest.
|
|
// Disable assertion that all methods/fields have hidden API flags assigned.
|
|
if !ctx.Config().FrameworksBaseDirExists(ctx) {
|
|
enforceHiddenApiFlagsToAllMembers = false
|
|
}
|
|
// b/149353192: when a module is instrumented, jacoco adds synthetic members
|
|
// $jacocoData and $jacocoInit. Since they don't exist when building the hidden API flags,
|
|
// don't complain when we don't find hidden API flags for the synthetic members.
|
|
if j, ok := ctx.Module().(interface {
|
|
shouldInstrument(android.BaseModuleContext) bool
|
|
}); ok && j.shouldInstrument(ctx) {
|
|
enforceHiddenApiFlagsToAllMembers = false
|
|
}
|
|
|
|
if !enforceHiddenApiFlagsToAllMembers {
|
|
hiddenapiFlags = "--no-force-assign-all"
|
|
}
|
|
|
|
ctx.Build(pctx, android.BuildParams{
|
|
Rule: hiddenAPIEncodeDexRule,
|
|
Description: "hiddenapi encode dex",
|
|
Input: dexInput,
|
|
Output: tmpOutput,
|
|
Implicit: flagsCSV,
|
|
Args: map[string]string{
|
|
"flagsCsv": flagsCSV.String(),
|
|
"tmpDir": tmpDir.String(),
|
|
"soongZipFlags": soongZipFlags,
|
|
"hiddenapiFlags": hiddenapiFlags,
|
|
},
|
|
})
|
|
|
|
if uncompressDex {
|
|
TransformZipAlign(ctx, output, tmpOutput)
|
|
}
|
|
}
|