Add IKE stub to main Android SDK am: f8b973c3f6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573900

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4316d201a5c253ef9c73505943b21e1d0141bbb9
This commit is contained in:
Yan Yan
2021-02-10 19:20:15 +00:00
committed by Automerger Merge Worker
4 changed files with 13 additions and 1 deletions

View File

@@ -363,6 +363,7 @@ filegroup {
":framework-statsd-sources", ":framework-statsd-sources",
":framework-tethering-srcs", ":framework-tethering-srcs",
":framework-wifi-updatable-sources", ":framework-wifi-updatable-sources",
":ike-srcs",
":updatable-media-srcs", ":updatable-media-srcs",
], ],
visibility: ["//visibility:private"], visibility: ["//visibility:private"],
@@ -371,6 +372,7 @@ filegroup {
java_library { java_library {
name: "framework-updatable-stubs-module_libs_api", name: "framework-updatable-stubs-module_libs_api",
static_libs: [ static_libs: [
"android.net.ipsec.ike.stubs.module_lib",
"framework-media.stubs.module_lib", "framework-media.stubs.module_lib",
"framework-mediaprovider.stubs.module_lib", "framework-mediaprovider.stubs.module_lib",
"framework-permission.stubs.module_lib", "framework-permission.stubs.module_lib",
@@ -387,6 +389,7 @@ java_library {
name: "framework-all", name: "framework-all",
installable: false, installable: false,
static_libs: [ static_libs: [
"android.net.ipsec.ike.impl",
"framework-minus-apex", "framework-minus-apex",
"framework-mediaprovider.impl", "framework-mediaprovider.impl",
"framework-permission.impl", "framework-permission.impl",

View File

@@ -303,6 +303,7 @@ java_library_static {
name: "android_stubs_current", name: "android_stubs_current",
srcs: [ ":api-stubs-docs-non-updatable" ], srcs: [ ":api-stubs-docs-non-updatable" ],
static_libs: [ static_libs: [
"android.net.ipsec.ike.stubs",
"art.module.public.api.stubs", "art.module.public.api.stubs",
"conscrypt.module.public.api.stubs", "conscrypt.module.public.api.stubs",
"framework-media.stubs", "framework-media.stubs",
@@ -322,6 +323,7 @@ java_library_static {
name: "android_system_stubs_current", name: "android_system_stubs_current",
srcs: [ ":system-api-stubs-docs-non-updatable" ], srcs: [ ":system-api-stubs-docs-non-updatable" ],
static_libs: [ static_libs: [
"android.net.ipsec.ike.stubs.system",
"art.module.public.api.stubs", "art.module.public.api.stubs",
"conscrypt.module.public.api.stubs", "conscrypt.module.public.api.stubs",
"framework-media.stubs.system", "framework-media.stubs.system",
@@ -357,6 +359,7 @@ java_library_static {
static_libs: [ static_libs: [
// Modules do not have test APIs, but we want to include their SystemApis, like we include // Modules do not have test APIs, but we want to include their SystemApis, like we include
// the SystemApi of framework-non-updatable-sources. // the SystemApi of framework-non-updatable-sources.
"android.net.ipsec.ike.stubs.system",
"art.module.public.api.stubs", "art.module.public.api.stubs",
"conscrypt.module.public.api.stubs", "conscrypt.module.public.api.stubs",
"framework-media.stubs.system", "framework-media.stubs.system",

View File

@@ -28,6 +28,7 @@ genrule {
genrule { genrule {
name: "frameworks-base-api-current.txt", name: "frameworks-base-api-current.txt",
srcs: [ srcs: [
":android.net.ipsec.ike{.public.api.txt}",
":art.module.public.api{.public.api.txt}", ":art.module.public.api{.public.api.txt}",
":conscrypt.module.public.api{.public.api.txt}", ":conscrypt.module.public.api{.public.api.txt}",
":framework-media{.public.api.txt}", ":framework-media{.public.api.txt}",
@@ -61,6 +62,7 @@ genrule {
genrule { genrule {
name: "frameworks-base-api-current.srcjar", name: "frameworks-base-api-current.srcjar",
srcs: [ srcs: [
":android.net.ipsec.ike{.public.stubs.source}",
":api-stubs-docs-non-updatable", ":api-stubs-docs-non-updatable",
":art.module.public.api{.public.stubs.source}", ":art.module.public.api{.public.stubs.source}",
":conscrypt.module.public.api{.public.stubs.source}", ":conscrypt.module.public.api{.public.stubs.source}",
@@ -82,6 +84,7 @@ genrule {
genrule { genrule {
name: "frameworks-base-api-removed.txt", name: "frameworks-base-api-removed.txt",
srcs: [ srcs: [
":android.net.ipsec.ike{.public.removed-api.txt}",
":art.module.public.api{.public.removed-api.txt}", ":art.module.public.api{.public.removed-api.txt}",
":conscrypt.module.public.api{.public.removed-api.txt}", ":conscrypt.module.public.api{.public.removed-api.txt}",
":framework-media{.public.removed-api.txt}", ":framework-media{.public.removed-api.txt}",
@@ -114,6 +117,7 @@ genrule {
genrule { genrule {
name: "frameworks-base-api-system-current.txt", name: "frameworks-base-api-system-current.txt",
srcs: [ srcs: [
":android.net.ipsec.ike{.system.api.txt}",
":framework-media{.system.api.txt}", ":framework-media{.system.api.txt}",
":framework-mediaprovider{.system.api.txt}", ":framework-mediaprovider{.system.api.txt}",
":framework-permission{.system.api.txt}", ":framework-permission{.system.api.txt}",
@@ -144,6 +148,7 @@ genrule {
genrule { genrule {
name: "frameworks-base-api-system-removed.txt", name: "frameworks-base-api-system-removed.txt",
srcs: [ srcs: [
":android.net.ipsec.ike{.system.removed-api.txt}",
":framework-media{.system.removed-api.txt}", ":framework-media{.system.removed-api.txt}",
":framework-mediaprovider{.system.removed-api.txt}", ":framework-mediaprovider{.system.removed-api.txt}",
":framework-permission{.system.removed-api.txt}", ":framework-permission{.system.removed-api.txt}",
@@ -174,6 +179,7 @@ genrule {
genrule { genrule {
name: "frameworks-base-api-module-lib-current.txt", name: "frameworks-base-api-module-lib-current.txt",
srcs: [ srcs: [
":android.net.ipsec.ike{.module-lib.api.txt}",
":framework-media{.module-lib.api.txt}", ":framework-media{.module-lib.api.txt}",
":framework-mediaprovider{.module-lib.api.txt}", ":framework-mediaprovider{.module-lib.api.txt}",
":framework-permission{.module-lib.api.txt}", ":framework-permission{.module-lib.api.txt}",
@@ -203,6 +209,7 @@ genrule {
genrule { genrule {
name: "frameworks-base-api-module-lib-removed.txt", name: "frameworks-base-api-module-lib-removed.txt",
srcs: [ srcs: [
":android.net.ipsec.ike{.module-lib.removed-api.txt}",
":framework-media{.module-lib.removed-api.txt}", ":framework-media{.module-lib.removed-api.txt}",
":framework-mediaprovider{.module-lib.removed-api.txt}", ":framework-mediaprovider{.module-lib.removed-api.txt}",
":framework-permission{.module-lib.removed-api.txt}", ":framework-permission{.module-lib.removed-api.txt}",

View File

@@ -98,7 +98,6 @@ java_library_static {
"android.hardware.power-V1-java", "android.hardware.power-V1-java",
"android.hardware.power-V1.0-java", "android.hardware.power-V1.0-java",
"android.hardware.vibrator-V1-java", "android.hardware.vibrator-V1-java",
"android.net.ipsec.ike.stubs.module_lib",
"app-compat-annotations", "app-compat-annotations",
"framework-tethering.stubs.module_lib", "framework-tethering.stubs.module_lib",
"service-permission.stubs.system_server", "service-permission.stubs.system_server",