Snap for 9355375 from 00a9c6d5aae9327fd32b0fd0753d3b681c2f9c47 to mainline-tethering-release
Change-Id: Ia9f10d45665475d4edf1b9c3fb0ce51419492c82
diff --git a/1/Android.bp b/1/Android.bp.auto
similarity index 100%
rename from 1/Android.bp
rename to 1/Android.bp.auto
diff --git a/current/Android.bp b/current/Android.bp
index a4fa13a..dbf8f8f 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -15,29 +15,6 @@
default_applicable_licenses: ["Android-Apache-2.0"],
}
-prebuilt_bootclasspath_fragment {
- name: "sdkextensions-sdk_com.android.sdkext-bootclasspath-fragment@current",
- sdk_member_name: "com.android.sdkext-bootclasspath-fragment",
- visibility: ["//packages/modules/SdkExtensions:__subpackages__"],
- apex_available: ["com.android.sdkext"],
- licenses: ["sdkextensions-sdk_Android-Apache-2.0@current"],
- contents: ["sdkextensions-sdk_framework-sdkextensions@current"],
- fragments: [
- {
- apex: "com.android.art",
- module: "art-bootclasspath-fragment",
- },
- ],
- hidden_api: {
- annotation_flags: "hiddenapi/annotation-flags.csv",
- metadata: "hiddenapi/metadata.csv",
- index: "hiddenapi/index.csv",
- signature_patterns: "hiddenapi/signature-patterns.csv",
- filtered_stub_flags: "hiddenapi/filtered-stub-flags.csv",
- filtered_flags: "hiddenapi/filtered-flags.csv",
- },
-}
-
module_prebuilt_bootclasspath_fragment {
name: "com.android.sdkext-bootclasspath-fragment",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -67,43 +44,6 @@
},
}
-java_sdk_library_import {
- name: "sdkextensions-sdk_framework-sdkextensions@current",
- sdk_member_name: "framework-sdkextensions",
- visibility: ["//visibility:public"],
- apex_available: [
- "com.android.sdkext",
- "test_com.android.sdkext",
- ],
- licenses: ["sdkextensions-sdk_Android-Apache-2.0@current"],
- shared_library: false,
- permitted_packages: ["android.os.ext"],
- public: {
- jars: ["sdk_library/public/framework-sdkextensions-stubs.jar"],
- stub_srcs: ["sdk_library/public/framework-sdkextensions.srcjar"],
- current_api: "sdk_library/public/framework-sdkextensions.txt",
- removed_api: "sdk_library/public/framework-sdkextensions-removed.txt",
- annotations: "sdk_library/public/framework-sdkextensions_annotations.zip",
- sdk_version: "module_current",
- },
- system: {
- jars: ["sdk_library/system/framework-sdkextensions-stubs.jar"],
- stub_srcs: ["sdk_library/system/framework-sdkextensions.srcjar"],
- current_api: "sdk_library/system/framework-sdkextensions.txt",
- removed_api: "sdk_library/system/framework-sdkextensions-removed.txt",
- annotations: "sdk_library/system/framework-sdkextensions_annotations.zip",
- sdk_version: "module_current",
- },
- module_lib: {
- jars: ["sdk_library/module-lib/framework-sdkextensions-stubs.jar"],
- stub_srcs: ["sdk_library/module-lib/framework-sdkextensions.srcjar"],
- current_api: "sdk_library/module-lib/framework-sdkextensions.txt",
- removed_api: "sdk_library/module-lib/framework-sdkextensions-removed.txt",
- annotations: "sdk_library/module-lib/framework-sdkextensions_annotations.zip",
- sdk_version: "module_current",
- },
-}
-
module_java_sdk_library_import {
name: "framework-sdkextensions",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -148,23 +88,8 @@
}
license {
- name: "sdkextensions-sdk_Android-Apache-2.0@current",
- sdk_member_name: "Android-Apache-2.0",
- visibility: ["//visibility:private"],
- license_kinds: ["SPDX-license-identifier-Apache-2.0"],
- license_text: ["licenses/build/soong/licenses/LICENSE"],
-}
-
-license {
name: "sdkextensions-sdk_Android-Apache-2.0",
visibility: ["//visibility:private"],
license_kinds: ["SPDX-license-identifier-Apache-2.0"],
license_text: ["licenses/build/soong/licenses/LICENSE"],
}
-
-sdk_snapshot {
- name: "sdkextensions-sdk@current",
- visibility: ["//packages/modules/SdkExtensions:__subpackages__"],
- bootclasspath_fragments: ["sdkextensions-sdk_com.android.sdkext-bootclasspath-fragment@current"],
- java_sdk_libs: ["sdkextensions-sdk_framework-sdkextensions@current"],
-}
