Add non-updatable-framework-module-defaults
These java_defaults are useful for the java_sdk_libraries that belong to non-updatable APEXes. Defaults are very similar to the framework-module-defaults, the main differences are: 1. non-updatable-framework-module-defaults enables @TestApi surface 2. non-updatable-framework-module-defaults doesn't enable strict_updatability_linting Allow list of the users of these new defaults is controlled by the defaults_visibility, so far only Virtualization apex is allowed to use non-updatable-framework-module-defaults. Bug: 243512044 Test: m Change-Id: Id06fb6fc43be78c1bd92c29e7593df89e412f598
This commit is contained in:
@@ -108,12 +108,33 @@ java_defaults {
|
|||||||
|
|
||||||
defaults_visibility: ["//visibility:private"],
|
defaults_visibility: ["//visibility:private"],
|
||||||
|
|
||||||
// Disallow disabling the NewApi lint check.
|
dist_group: "android",
|
||||||
lint: {
|
}
|
||||||
strict_updatability_linting: true,
|
|
||||||
|
// Defaults for the java_sdk_libraries of non-updatable modules.
|
||||||
|
// java_sdk_libraries using these defaults should also add themselves to the
|
||||||
|
// non_updatable_modules list in frameworks/base/api/api.go
|
||||||
|
java_defaults {
|
||||||
|
name: "non-updatable-framework-module-defaults",
|
||||||
|
defaults: ["framework-module-common-defaults"],
|
||||||
|
|
||||||
|
system: {
|
||||||
|
enabled: true,
|
||||||
|
sdk_version: "module_current",
|
||||||
|
},
|
||||||
|
module_lib: {
|
||||||
|
enabled: true,
|
||||||
|
sdk_version: "module_current",
|
||||||
|
},
|
||||||
|
// Non-updatable modules are allowed to provide @TestApi
|
||||||
|
test: {
|
||||||
|
enabled: true,
|
||||||
|
sdk_version: "module_current",
|
||||||
},
|
},
|
||||||
|
|
||||||
dist_group: "android",
|
defaults_visibility: [
|
||||||
|
"//packages/modules/Virtualization:__subpackages__",
|
||||||
|
],
|
||||||
}
|
}
|
||||||
|
|
||||||
// Defaults for mainline module provided java_sdk_library instances.
|
// Defaults for mainline module provided java_sdk_library instances.
|
||||||
@@ -130,6 +151,12 @@ java_defaults {
|
|||||||
enabled: true,
|
enabled: true,
|
||||||
sdk_version: "module_current",
|
sdk_version: "module_current",
|
||||||
},
|
},
|
||||||
|
|
||||||
|
// Disallow disabling the NewApi lint check.
|
||||||
|
lint: {
|
||||||
|
strict_updatability_linting: true,
|
||||||
|
},
|
||||||
|
|
||||||
defaults_visibility: [
|
defaults_visibility: [
|
||||||
":__subpackages__",
|
":__subpackages__",
|
||||||
"//frameworks/base/apex:__subpackages__",
|
"//frameworks/base/apex:__subpackages__",
|
||||||
@@ -151,6 +178,12 @@ java_defaults {
|
|||||||
enabled: true,
|
enabled: true,
|
||||||
sdk_version: "system_server_current",
|
sdk_version: "system_server_current",
|
||||||
},
|
},
|
||||||
|
|
||||||
|
// Disallow disabling the NewApi lint check.
|
||||||
|
lint: {
|
||||||
|
strict_updatability_linting: true,
|
||||||
|
},
|
||||||
|
|
||||||
defaults_visibility: [
|
defaults_visibility: [
|
||||||
":__subpackages__",
|
":__subpackages__",
|
||||||
"//art/libartservice:__subpackages__",
|
"//art/libartservice:__subpackages__",
|
||||||
|
|||||||
Reference in New Issue
Block a user