Revert "Default annotations_enabled to true for sdk_library"
This reverts commit a9a3173ee3
.
Bug: 157010342
Reason for revert: broke ike
Exempt-From-Owner-Approval: clean revert
Change-Id: I592f50d0263ce78ea6d0d335cc7e0f493fcff800
This commit is contained in:
@@ -789,9 +789,6 @@ func (module *SdkLibrary) createStubsLibrary(mctx android.DefaultableHookContext
|
||||
props.Patch_module = module.properties.Patch_module
|
||||
props.Installable = proptools.BoolPtr(false)
|
||||
props.Libs = module.sdkLibraryProperties.Stub_only_libs
|
||||
// The stub-annotations library contains special versions of the annotations
|
||||
// with CLASS retention policy, so that they're kept around for kotlin.
|
||||
props.Libs = append(props.Libs, "stub-annotations")
|
||||
props.Product_variables.Pdk.Enabled = proptools.BoolPtr(false)
|
||||
props.Openjdk9.Srcs = module.properties.Openjdk9.Srcs
|
||||
props.Openjdk9.Javacflags = module.properties.Openjdk9.Javacflags
|
||||
@@ -825,7 +822,6 @@ func (module *SdkLibrary) createStubsSourcesAndApi(mctx android.DefaultableHookC
|
||||
Arg_files []string
|
||||
Args *string
|
||||
Java_version *string
|
||||
Annotations_enabled *bool
|
||||
Merge_annotations_dirs []string
|
||||
Merge_inclusion_annotations_dirs []string
|
||||
Generate_stubs *bool
|
||||
@@ -876,7 +872,6 @@ func (module *SdkLibrary) createStubsSourcesAndApi(mctx android.DefaultableHookC
|
||||
props.Aidl.Local_include_dirs = module.deviceProperties.Aidl.Local_include_dirs
|
||||
props.Java_version = module.properties.Java_version
|
||||
|
||||
props.Annotations_enabled = proptools.BoolPtr(true)
|
||||
props.Merge_annotations_dirs = module.sdkLibraryProperties.Merge_annotations_dirs
|
||||
props.Merge_inclusion_annotations_dirs = module.sdkLibraryProperties.Merge_inclusion_annotations_dirs
|
||||
|
||||
|
@@ -176,7 +176,6 @@ func GatherRequiredDepsForTest() string {
|
||||
"kotlin-stdlib-jdk7",
|
||||
"kotlin-stdlib-jdk8",
|
||||
"kotlin-annotations",
|
||||
"stub-annotations",
|
||||
}
|
||||
|
||||
for _, extra := range extraModules {
|
||||
|
@@ -61,20 +61,17 @@ java_import {
|
||||
name: "android_module_lib_stubs_current",
|
||||
}
|
||||
java_import {
|
||||
name: "core-lambda-stubs",
|
||||
name: "core-lambda-stubs",
|
||||
sdk_version: "none",
|
||||
}
|
||||
java_import {
|
||||
name: "ext",
|
||||
name: "ext",
|
||||
sdk_version: "none",
|
||||
}
|
||||
java_import {
|
||||
name: "framework",
|
||||
name: "framework",
|
||||
sdk_version: "none",
|
||||
}
|
||||
java_library {
|
||||
name: "stub-annotations",
|
||||
}
|
||||
` + bp
|
||||
|
||||
return testSdkWithFs(t, bp, fs)
|
||||
|
Reference in New Issue
Block a user