Build system_server jars with system_server api am: d2cbe05c06 am: 6e7aea2c3c

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1644908

Change-Id: Ib2e6df10109cdf769d6febd98c0827343bba1181
This commit is contained in:
Anton Hansson
2021-03-19 09:58:04 +00:00
committed by Automerger Merge Worker

View File

@@ -126,16 +126,13 @@ java_defaults {
// Collates API usages from each module for further analysis. // Collates API usages from each module for further analysis.
plugins: ["java_api_finder"], plugins: ["java_api_finder"],
// Mainline modules should only rely on 'module_lib' APIs provided by other modules
// and the non updatable parts of the platform.
sdk_version: "module_current",
} }
// Defaults for mainline module provided java_sdk_library instances. // Defaults for mainline module provided java_sdk_library instances.
java_defaults { java_defaults {
name: "framework-module-defaults", name: "framework-module-defaults",
defaults: ["framework-module-common-defaults"], defaults: ["framework-module-common-defaults"],
sdk_version: "module_current",
system: { system: {
enabled: true, enabled: true,
@@ -161,10 +158,11 @@ java_defaults {
java_defaults { java_defaults {
name: "framework-system-server-module-defaults", name: "framework-system-server-module-defaults",
defaults: ["framework-module-common-defaults"], defaults: ["framework-module-common-defaults"],
sdk_version: "system_server_current",
system_server: { system_server: {
enabled: true, enabled: true,
sdk_version: "module_current", sdk_version: "system_server_current",
}, },
defaults_visibility: [ defaults_visibility: [
":__subpackages__", ":__subpackages__",