Merge changes Ib0389900,Ib2d69dea am: e28d0c0ff3 am: 7204ec83ef

am: 1a5d25499a

Change-Id: I5b2ce79790b12fab360339faba6f7ef548eb961a
This commit is contained in:
Paul Duffin
2019-03-01 01:23:21 -08:00
committed by android-build-merger
3 changed files with 36 additions and 16 deletions

View File

@@ -33,12 +33,6 @@ var (
DefaultLambdaStubsLibrary = "core-lambda-stubs"
SdkLambdaStubsPath = "prebuilts/sdk/tools/core-lambda-stubs.jar"
// A list of the jars that provide information about usages of the hidden API.
HiddenAPIExtraAppUsageJars = []string{
// The core-oj-hiddenapi provides information for the core-oj jar.
"core-oj-hiddenapi",
}
DefaultJacocoExcludeFilter = []string{"org.junit.*", "org.jacoco.*", "org.mockito.*"}
InstrumentFrameworkModules = []string{