67b9d61ac2
Previously, the signatures used to select the subset of the monolithic
flags were simply the signatures read from the modular flags file. This
change moves the creation of the signature list into a separate script
that outputs the signatures to a file and then passes the path through
Soong from the bootclasspath_fragment modules that create it to the
platform_bootclasspath module that uses it to compare the modular
flags against the monolithic flags.
Currently, the signatures are the full signatures but follow up changes
will replace them with patterns (hence the name) that avoids having to
include implementation details in the hidden API flags that are output
as part of a bootclasspath_fragment's snapshot.
This change moves the stub flags related code next to the all flags
related code as they are treated in a similar way.
Bug: 194063708
Test: atest --host verify_overlaps_test signature_patterns_test
m out/soong/hiddenapi/hiddenapi-flags.csv
- manually change files to cause difference in flags to check
that it detects the differences.
Change-Id: I2855bf6d05c91b8a09591664185750361c7e644f
93 lines
3.7 KiB
Go
93 lines
3.7 KiB
Go
// Copyright (C) 2021 The Android Open Source Project
|
|
//
|
|
// 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"
|
|
"github.com/google/blueprint"
|
|
)
|
|
|
|
// MonolithicHiddenAPIInfo contains information needed/provided by the hidden API generation of the
|
|
// monolithic hidden API files.
|
|
//
|
|
// Each list of paths includes all the equivalent paths from each of the bootclasspath_fragment
|
|
// modules that contribute to the platform-bootclasspath.
|
|
type MonolithicHiddenAPIInfo struct {
|
|
// FlagsFilesByCategory maps from the flag file category to the paths containing information for
|
|
// that category.
|
|
FlagsFilesByCategory FlagFilesByCategory
|
|
|
|
// The paths to the generated annotation-flags.csv files.
|
|
AnnotationFlagsPaths android.Paths
|
|
|
|
// The paths to the generated metadata.csv files.
|
|
MetadataPaths android.Paths
|
|
|
|
// The paths to the generated index.csv files.
|
|
IndexPaths android.Paths
|
|
|
|
// The subsets of the monolithic hiddenapi-stubs-flags.txt file that are provided by each
|
|
// bootclasspath_fragment modules.
|
|
StubFlagSubsets SignatureCsvSubsets
|
|
|
|
// The subsets of the monolithic hiddenapi-flags.csv file that are provided by each
|
|
// bootclasspath_fragment modules.
|
|
FlagSubsets SignatureCsvSubsets
|
|
|
|
// The classes jars from the libraries on the platform bootclasspath.
|
|
ClassesJars android.Paths
|
|
}
|
|
|
|
// newMonolithicHiddenAPIInfo creates a new MonolithicHiddenAPIInfo from the flagFilesByCategory
|
|
// plus information provided by each of the fragments.
|
|
func newMonolithicHiddenAPIInfo(ctx android.ModuleContext, flagFilesByCategory FlagFilesByCategory, classpathElements ClasspathElements) MonolithicHiddenAPIInfo {
|
|
monolithicInfo := MonolithicHiddenAPIInfo{}
|
|
|
|
monolithicInfo.FlagsFilesByCategory = flagFilesByCategory
|
|
|
|
// Merge all the information from the classpathElements. The fragments form a DAG so it is possible that
|
|
// this will introduce duplicates so they will be resolved after processing all the classpathElements.
|
|
for _, element := range classpathElements {
|
|
switch e := element.(type) {
|
|
case *ClasspathLibraryElement:
|
|
classesJars := retrieveClassesJarsFromModule(e.Module())
|
|
monolithicInfo.ClassesJars = append(monolithicInfo.ClassesJars, classesJars...)
|
|
|
|
case *ClasspathFragmentElement:
|
|
fragment := e.Module()
|
|
if ctx.OtherModuleHasProvider(fragment, HiddenAPIInfoProvider) {
|
|
info := ctx.OtherModuleProvider(fragment, HiddenAPIInfoProvider).(HiddenAPIInfo)
|
|
monolithicInfo.append(&info)
|
|
} else {
|
|
ctx.ModuleErrorf("%s does not provide hidden API information", fragment)
|
|
}
|
|
}
|
|
}
|
|
|
|
return monolithicInfo
|
|
}
|
|
|
|
// append appends all the files from the supplied info to the corresponding files in this struct.
|
|
func (i *MonolithicHiddenAPIInfo) append(other *HiddenAPIInfo) {
|
|
i.FlagsFilesByCategory.append(other.FlagFilesByCategory)
|
|
i.AnnotationFlagsPaths = append(i.AnnotationFlagsPaths, other.AnnotationFlagsPath)
|
|
i.MetadataPaths = append(i.MetadataPaths, other.MetadataPath)
|
|
i.IndexPaths = append(i.IndexPaths, other.IndexPath)
|
|
|
|
i.StubFlagSubsets = append(i.StubFlagSubsets, other.StubFlagSubset())
|
|
i.FlagSubsets = append(i.FlagSubsets, other.FlagSubset())
|
|
}
|
|
|
|
var MonolithicHiddenAPIInfoProvider = blueprint.NewProvider(MonolithicHiddenAPIInfo{})
|