Snap for 9940335 from 406885223ba0955e92013e4eb535f81a7a37895d to udc-d1-release

Change-Id: Ieb51d84f7b66642489eaef1448d0a432b384995c
diff --git a/apis/Android.bp b/apis/Android.bp
deleted file mode 100644
index b2896dc..0000000
--- a/apis/Android.bp
+++ /dev/null
@@ -1,353 +0,0 @@
-// Copyright 2022 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-api_domain {
-    name: "system",
-    cc_api_contributions: [
-        // ndk libraries for publicapi
-        "libaaudio.ndk",
-        "libamidi.ndk",
-        "libandroid.ndk",
-        "libbinder_ndk.ndk",
-        "libcamera2ndk.ndk",
-        "libEGL.ndk",
-        "libGLESv1_CM.ndk",
-        "libGLESv2.ndk",
-        "libGLESv3.ndk",
-        "libicu.ndk",
-        "libjnigraphics.ndk",
-        "liblog.ndk",
-        "libnativewindow.ndk",
-        "libOpenMAXAL.ndk",
-        "libOpenSLES.ndk",
-        "libstdc++.ndk",
-        "libsync.ndk",
-        "libvulkan.ndk",
-        "libz.ndk",
-
-        // module-libapi (used by apexes) and vendorapi libraries
-        "heapprofd_api_noop",
-        "heapprofd_client_api",
-        "libaaudio",
-        "libadbd_auth",
-        "libadbd_fs",
-        "libandroid",
-        "libandroid_net",
-        "libartpalette-system",
-        "libbinder_ndk",
-        "libbinder_rpc_unstable",
-        "libcgrouprc",
-        "libft2",
-        "libEGL",
-        "libGLESv1_CM",
-        "libGLESv2",
-        "libGLESv3",
-        "libincident",
-        "liblog",
-        "libmediametrics",
-        "libmediandk",
-        "libnativewindow",
-        "libneuralnetworks_packageinfo",
-        "libRS",
-        "libselinux",
-        "libsync",
-        "libvndksupport",
-        "libvulkan",
-        "libz",
-    ],
-
-    java_api_contributions: [
-        "api-stubs-docs-non-updatable",
-        "module-lib-api-stubs-docs-non-updatable",
-        "system-api-stubs-docs-non-updatable",
-        "test-api-stubs-docs-non-updatable",
-    ],
-}
-
-// All the apex api_domains have been suffixed with .contribution for now
-// This prevents a name-collision with the actual apex
-// Long term, the implementation of these two module types should be merged
-api_domain {
-    name: "com.android.adbd.contribution",
-    cc_api_contributions: [
-        "libadb_pairing_auth",
-        "libadb_pairing_connection",
-        "libadb_pairing_server",
-        "libadbconnection_client",
-    ],
-}
-
-api_domain {
-    name: "com.android.art.contribution",
-    cc_api_contributions: [
-        "libandroidio",
-        "libdexfile",
-        "libnativebridge",
-        "libnativehelper",
-        "libnativeloader",
-        "libsigchain",
-    ],
-    java_api_contributions: [
-        "art.module.intra.core.api.stubs.source",
-        "art.module.public.api.stubs.source",
-        "art.module.public.api.stubs.source.module_lib",
-        "art.module.public.api.stubs.source.system",
-        // ART's contributions to Toolchain API surface
-        // This is a droidstubs module and not a java_sdk_library
-        "art.module.toolchain.api",
-    ],
-}
-
-api_domain {
-    name: "com.android.adservices.contribution",
-    // This apex contributes 2 java libraries
-    java_api_contributions: [
-        "framework-adservices.stubs.source",
-        "framework-adservices.stubs.source.module_lib",
-        "framework-adservices.stubs.source.system",
-        "framework-sdksandbox.stubs.source",
-        "framework-sdksandbox.stubs.source.module_lib",
-        "framework-sdksandbox.stubs.source.system",
-    ],
-}
-
-api_domain {
-    name: "com.android.appsearch.contribution",
-    java_api_contributions: [
-        "framework-appsearch.stubs.source",
-        "framework-appsearch.stubs.source.module_lib",
-        "framework-appsearch.stubs.source.system",
-    ],
-}
-
-api_domain {
-    name: "com.android.bluetooth.contribution",
-    java_api_contributions: [
-        "framework-bluetooth.stubs.source",
-        "framework-bluetooth.stubs.source.module_lib",
-        "framework-bluetooth.stubs.source.system",
-    ],
-}
-
-api_domain {
-    name: "com.android.connectivity.contribution",
-    java_api_contributions: [
-        "framework-connectivity.stubs.source",
-        "framework-connectivity.stubs.source.module_lib",
-        "framework-connectivity.stubs.source.system",
-    ],
-}
-
-api_domain {
-    name: "com.android.connectivity-t.contribution",
-    java_api_contributions: [
-        "framework-connectivity-t.stubs.source",
-        "framework-connectivity-t.stubs.source.module_lib",
-        "framework-connectivity-t.stubs.source.system",
-    ],
-}
-
-api_domain {
-    name: "com.android.conscrypt.contribution",
-    java_api_contributions: [
-        "conscrypt.module.intra.core.api.stubs.source",
-        "conscrypt.module.platform.api.stubs.source",
-        "conscrypt.module.public.api.stubs.source",
-        "conscrypt.module.public.api.stubs.source.module_lib",
-        "conscrypt.module.public.api.stubs.source.system",
-    ],
-}
-
-api_domain {
-    name: "com.android.graphics.contribution",
-    java_api_contributions: [
-        "framework-graphics.stubs.source",
-        "framework-graphics.stubs.source.module_lib",
-        "framework-graphics.stubs.source.system",
-    ],
-}
-
-api_domain {
-    name: "com.android.i18n.contribution",
-    cc_api_contributions: [
-        "libandroidicu",
-        "libicu",
-    ],
-    java_api_contributions: [
-        "i18n.module.intra.core.api.stubs.source",
-        "i18n.module.public.api.stubs.source",
-        "i18n.module.public.api.stubs.source.module_lib",
-        "i18n.module.public.api.stubs.source.system",
-        // i18n exports two versions of CorePlatformApi (stable and legacy)
-        "legacy.i18n.module.platform.api.stubs.source",
-        "stable.i18n.module.platform.api.stubs.source",
-    ],
-}
-
-api_domain {
-    name: "com.android.ipsec.contribution",
-    java_api_contributions: [
-        "android.net.ipsec.ike.stubs.source",
-        "android.net.ipsec.ike.stubs.source.module_lib",
-        "android.net.ipsec.ike.stubs.source.system",
-    ],
-}
-
-api_domain {
-    name: "com.android.media.contribution",
-    java_api_contributions: [
-        "framework-media.stubs.source",
-        "framework-media.stubs.source.module_lib",
-        "framework-media.stubs.source.system",
-    ],
-}
-
-api_domain {
-    name: "com.android.mediaprovider.contribution",
-    java_api_contributions: [
-        "framework-mediaprovider.stubs.source",
-        "framework-mediaprovider.stubs.source.module_lib",
-        "framework-mediaprovider.stubs.source.system",
-    ],
-}
-
-api_domain {
-    name: "com.android.neuralnetworks.contribution",
-    cc_api_contributions: [
-        "libneuralnetworks.ndk",
-        "libneuralnetworks",
-    ],
-}
-
-api_domain {
-    name: "com.android.ondevicepersonalization.contribution",
-    java_api_contributions: [
-        "framework-ondevicepersonalization.stubs.source",
-        "framework-ondevicepersonalization.stubs.source.module_lib",
-        "framework-ondevicepersonalization.stubs.source.system",
-    ],
-}
-
-api_domain {
-    name: "com.android.os.statsd.contribution",
-    cc_api_contributions: [
-        "libstatspull",
-        "libstatssocket",
-    ],
-    java_api_contributions: [
-        "framework-statsd.stubs.source",
-        "framework-statsd.stubs.source.module_lib",
-        "framework-statsd.stubs.source.system",
-    ],
-}
-
-api_domain {
-    name: "com.android.permission.contribution",
-    java_api_contributions: [
-        "framework-permission.stubs.source",
-        "framework-permission.stubs.source.module_lib",
-        "framework-permission.stubs.source.system",
-    ],
-}
-
-api_domain {
-    name: "com.android.permission-s.contribution",
-    java_api_contributions: [
-        "framework-permission-s.stubs.source",
-        "framework-permission-s.stubs.source.module_lib",
-        "framework-permission-s.stubs.source.system",
-    ],
-}
-
-api_domain {
-    name: "com.android.resolv.contribution",
-    cc_api_contributions: [
-        "libnetd_resolv",
-    ],
-}
-
-api_domain {
-    name: "com.android.runtime.contribution",
-    cc_api_contributions: [
-        "libc.ndk",
-        "libdl.ndk",
-        "libm.ndk",
-        "libc",
-        "libdl",
-        "libdl_android",
-        "libm",
-    ],
-}
-
-api_domain {
-    name: "com.android.scheduling.contribution",
-    java_api_contributions: [
-        "framework-scheduling.stubs.source",
-        "framework-scheduling.stubs.source.module_lib",
-        "framework-scheduling.stubs.source.system",
-    ],
-}
-
-api_domain {
-    name: "com.android.sdkext.contribution",
-    java_api_contributions: [
-        "framework-sdkextensions.stubs.source",
-        "framework-sdkextensions.stubs.source.module_lib",
-        "framework-sdkextensions.stubs.source.system",
-    ],
-}
-
-api_domain {
-    name: "com.android.tethering.contribution",
-    cc_api_contributions: [
-        "libnetd_updatable",
-    ],
-    java_api_contributions: [
-        "framework-tethering.stubs.source",
-        "framework-tethering.stubs.source.module_lib",
-        "framework-tethering.stubs.source.system",
-    ],
-}
-
-api_domain {
-    name: "com.android.uwb.contribution",
-    java_api_contributions: [
-        "framework-uwb.stubs.source",
-        "framework-uwb.stubs.source.module_lib",
-        "framework-uwb.stubs.source.system",
-    ],
-}
-
-api_domain {
-    name: "com.android.virt.contribution",
-    java_api_contributions: [
-        "framework-virtualization.stubs.source",
-        "framework-virtualization.stubs.source.module_lib",
-        "framework-virtualization.stubs.source.system",
-        "framework-virtualization.stubs.source.test",
-    ],
-}
-
-api_domain {
-    name: "com.android.wifi.contribution",
-    java_api_contributions: [
-        "framework-wifi.stubs.source",
-        "framework-wifi.stubs.source.module_lib",
-        "framework-wifi.stubs.source.system",
-    ],
-}
diff --git a/apis/api_packages.json b/apis/api_packages.json
deleted file mode 100644
index 244930b..0000000
--- a/apis/api_packages.json
+++ /dev/null
@@ -1,157 +0,0 @@
-[
-	{
-		"api_domain": "com.android.adbd",
-		"api_package": "//build/orchestrator/apis",
-		"api_target": "com.android.adbd.contribution",
-		"is_apex": true
-	},
-	{
-		"api_domain": "com.android.art",
-		"api_package": "//build/orchestrator/apis",
-		"api_target": "com.android.art.contribution",
-		"is_apex": true
-	},
-	{
-		"api_domain": "com.android.adservices",
-		"api_package": "//build/orchestrator/apis",
-		"api_target": "com.android.adservices.contribution",
-		"is_apex": true
-	},
-	{
-		"api_domain": "com.android.appsearch",
-		"api_package": "//build/orchestrator/apis",
-		"api_target": "com.android.appsearch.contribution",
-		"is_apex": true
-	},
-	{
-		"api_domain": "com.android.bluetooth",
-		"api_package": "//build/orchestrator/apis",
-		"api_target": "com.android.bluetooth.contribution",
-		"is_apex": true
-	},
-	{
-		"api_domain": "com.android.connectivity",
-		"api_package": "//build/orchestrator/apis",
-		"api_target": "com.android.connectivity.contribution",
-		"is_apex": true
-	},
-	{
-		"api_domain": "com.android.connectivity-t",
-		"api_package": "//build/orchestrator/apis",
-		"api_target": "com.android.connectivity-t.contribution",
-		"is_apex": true
-	},
-	{
-		"api_domain": "com.android.conscrypt",
-		"api_package": "//build/orchestrator/apis",
-		"api_target": "com.android.conscrypt.contribution",
-		"is_apex": true
-	},
-	{
-		"api_domain": "com.android.graphics",
-		"api_package": "//build/orchestrator/apis",
-		"api_target": "com.android.graphics.contribution",
-		"is_apex": true
-	},
-	{
-		"api_domain": "com.android.i18n",
-		"api_package": "//build/orchestrator/apis",
-		"api_target": "com.android.i18n.contribution",
-		"is_apex": true
-	},
-	{
-		"api_domain": "com.android.ipsec",
-		"api_package": "//build/orchestrator/apis",
-		"api_target": "com.android.ipsec.contribution",
-		"is_apex": true
-	},
-	{
-		"api_domain": "com.android.media",
-		"api_package": "//build/orchestrator/apis",
-		"api_target": "com.android.media.contribution",
-		"is_apex": true
-	},
-	{
-		"api_domain": "com.android.mediaprovider",
-		"api_package": "//build/orchestrator/apis",
-		"api_target": "com.android.mediaprovider.contribution",
-		"is_apex": true
-	},
-	{
-		"api_domain": "com.android.neuralnetworks",
-		"api_package": "//build/orchestrator/apis",
-		"api_target": "com.android.neuralnetworks.contribution",
-		"is_apex": true
-	},
-	{
-		"api_domain": "com.android.os.statsd",
-		"api_package": "//build/orchestrator/apis",
-		"api_target": "com.android.os.statsd.contribution",
-		"is_apex": true
-	},
-	{
-		"api_domain": "com.android.ondevicepersonalization",
-		"api_package": "//build/orchestrator/apis",
-		"api_target": "com.android.ondevicepersonalization.contribution",
-		"is_apex": true
-	},
-	{
-		"api_domain": "com.android.permission",
-		"api_package": "//build/orchestrator/apis",
-		"api_target": "com.android.permission.contribution",
-		"is_apex": true
-	},
-	{
-		"api_domain": "com.android.permission-s",
-		"api_package": "//build/orchestrator/apis",
-		"api_target": "com.android.permission-s.contribution",
-		"is_apex": true
-	},
-	{
-		"api_domain": "com.android.resolv",
-		"api_package": "//build/orchestrator/apis",
-		"api_target": "com.android.resolv.contribution",
-		"is_apex": true
-	},
-	{
-		"api_domain": "com.android.scheduling",
-		"api_package": "//build/orchestrator/apis",
-		"api_target": "com.android.scheduling.contribution",
-		"is_apex": true
-	},
-	{
-		"api_domain": "com.android.sdkext",
-		"api_package": "//build/orchestrator/apis",
-		"api_target": "com.android.sdkext.contribution",
-		"is_apex": true
-	},
-	{
-		"api_domain": "com.android.tethering",
-		"api_package": "//build/orchestrator/apis",
-		"api_target": "com.android.tethering.contribution",
-		"is_apex": true
-	},
-	{
-		"api_domain": "com.android.uwb",
-		"api_package": "//build/orchestrator/apis",
-		"api_target": "com.android.uwb.contribution",
-		"is_apex": true
-	},
-	{
-		"api_domain": "com.android.virt",
-		"api_package": "//build/orchestrator/apis",
-		"api_target": "com.android.virt.contribution",
-		"is_apex": true
-	},
-	{
-		"api_domain": "com.android.wifi",
-		"api_package": "//build/orchestrator/apis",
-		"api_target": "com.android.wifi.contribution",
-		"is_apex": true
-	},
-	{
-		"api_domain": "system",
-		"api_package": "//build/orchestrator/apis",
-		"api_target": "system"
-	}
-]