diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-01-07 00:21:18 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-01-07 00:21:18 +0000 |
commit | 3b9762bc9b4d9b37b4d0424048feb99bf8a21e9f (patch) | |
tree | 30cb156f36f2ed871dd058595b96486817d34b19 | |
parent | 2537f18e0a85d4b71b8899b89b26a084dbfc3371 (diff) | |
parent | 54e05eb04f10b8a34699b84f0e54d65dc1f665fe (diff) | |
download | Connectivity-aml_sta_331910000.tar.gz |
Snap for 9463210 from 54e05eb04f10b8a34699b84f0e54d65dc1f665fe to mainline-os-statsd-releaseaml_sta_331910000aml_sta_331811000aml_sta_331711010aml_sta_331610000aml_sta_331511000android13-mainline-os-statsd-release
Change-Id: Id5ee8e72fb17d603a97467a4b2e4909631f1a562
-rw-r--r-- | 1/Android.bp.auto (renamed from 1/Android.bp) | 0 | ||||
-rw-r--r-- | current/Android.bp | 184 |
2 files changed, 0 insertions, 184 deletions
diff --git a/1/Android.bp b/1/Android.bp.auto index 99e3174..99e3174 100644 --- a/1/Android.bp +++ b/1/Android.bp.auto diff --git a/current/Android.bp b/current/Android.bp index 89841be..73d6116 100644 --- a/current/Android.bp +++ b/current/Android.bp @@ -17,42 +17,6 @@ package { default_applicable_licenses: ["Android-Apache-2.0"], } -prebuilt_bootclasspath_fragment { - name: "tethering-module-sdk_com.android.tethering-bootclasspath-fragment@current", - sdk_member_name: "com.android.tethering-bootclasspath-fragment", - visibility: ["//visibility:public"], - apex_available: ["com.android.tethering"], - licenses: ["tethering-module-sdk_Android-Apache-2.0@current"], - contents: [ - "tethering-module-sdk_framework-connectivity@current", - "tethering-module-sdk_framework-connectivity-t@current", - "tethering-module-sdk_framework-tethering@current", - ], - fragments: [ - { - apex: "com.android.art", - module: "art-bootclasspath-fragment", - }, - ], - hidden_api: { - unsupported: [ - "hiddenapi/hiddenapi-unsupported.txt", - "hiddenapi/hiddenapi-unsupported-tiramisu.txt", - ], - max_target_r_low_priority: ["hiddenapi/hiddenapi-max-target-r-loprio.txt"], - max_target_o_low_priority: [ - "hiddenapi/hiddenapi-max-target-o-low-priority.txt", - "hiddenapi/hiddenapi-max-target-o-low-priority-tiramisu.txt", - ], - 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.tethering-bootclasspath-fragment", // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true. @@ -95,40 +59,6 @@ module_prebuilt_bootclasspath_fragment { }, } -java_sdk_library_import { - name: "tethering-module-sdk_framework-connectivity@current", - sdk_member_name: "framework-connectivity", - visibility: ["//visibility:public"], - apex_available: ["com.android.tethering"], - licenses: ["tethering-module-sdk_Android-Apache-2.0@current"], - shared_library: false, - permitted_packages: ["android.net"], - public: { - jars: ["sdk_library/public/framework-connectivity-stubs.jar"], - stub_srcs: ["sdk_library/public/framework-connectivity.srcjar"], - current_api: "sdk_library/public/framework-connectivity.txt", - removed_api: "sdk_library/public/framework-connectivity-removed.txt", - annotations: "sdk_library/public/framework-connectivity_annotations.zip", - sdk_version: "module_current", - }, - system: { - jars: ["sdk_library/system/framework-connectivity-stubs.jar"], - stub_srcs: ["sdk_library/system/framework-connectivity.srcjar"], - current_api: "sdk_library/system/framework-connectivity.txt", - removed_api: "sdk_library/system/framework-connectivity-removed.txt", - annotations: "sdk_library/system/framework-connectivity_annotations.zip", - sdk_version: "module_current", - }, - module_lib: { - jars: ["sdk_library/module-lib/framework-connectivity-stubs.jar"], - stub_srcs: ["sdk_library/module-lib/framework-connectivity.srcjar"], - current_api: "sdk_library/module-lib/framework-connectivity.txt", - removed_api: "sdk_library/module-lib/framework-connectivity-removed.txt", - annotations: "sdk_library/module-lib/framework-connectivity_annotations.zip", - sdk_version: "module_current", - }, -} - module_java_sdk_library_import { name: "framework-connectivity", // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true. @@ -169,47 +99,6 @@ module_java_sdk_library_import { }, } -java_sdk_library_import { - name: "tethering-module-sdk_framework-connectivity-t@current", - sdk_member_name: "framework-connectivity-t", - visibility: ["//visibility:public"], - apex_available: ["com.android.tethering"], - licenses: ["tethering-module-sdk_Android-Apache-2.0@current"], - shared_library: false, - permitted_packages: [ - "android.app.usage", - "android.net", - "android.net.nsd", - "android.nearby", - "com.android.connectivity", - "com.android.nearby", - ], - public: { - jars: ["sdk_library/public/framework-connectivity-t-stubs.jar"], - stub_srcs: ["sdk_library/public/framework-connectivity-t.srcjar"], - current_api: "sdk_library/public/framework-connectivity-t.txt", - removed_api: "sdk_library/public/framework-connectivity-t-removed.txt", - annotations: "sdk_library/public/framework-connectivity-t_annotations.zip", - sdk_version: "module_current", - }, - system: { - jars: ["sdk_library/system/framework-connectivity-t-stubs.jar"], - stub_srcs: ["sdk_library/system/framework-connectivity-t.srcjar"], - current_api: "sdk_library/system/framework-connectivity-t.txt", - removed_api: "sdk_library/system/framework-connectivity-t-removed.txt", - annotations: "sdk_library/system/framework-connectivity-t_annotations.zip", - sdk_version: "module_current", - }, - module_lib: { - jars: ["sdk_library/module-lib/framework-connectivity-t-stubs.jar"], - stub_srcs: ["sdk_library/module-lib/framework-connectivity-t.srcjar"], - current_api: "sdk_library/module-lib/framework-connectivity-t.txt", - removed_api: "sdk_library/module-lib/framework-connectivity-t-removed.txt", - annotations: "sdk_library/module-lib/framework-connectivity-t_annotations.zip", - sdk_version: "module_current", - }, -} - module_java_sdk_library_import { name: "framework-connectivity-t", // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true. @@ -257,40 +146,6 @@ module_java_sdk_library_import { }, } -java_sdk_library_import { - name: "tethering-module-sdk_framework-tethering@current", - sdk_member_name: "framework-tethering", - visibility: ["//visibility:public"], - apex_available: ["com.android.tethering"], - licenses: ["tethering-module-sdk_Android-Apache-2.0@current"], - shared_library: false, - permitted_packages: ["android.net"], - public: { - jars: ["sdk_library/public/framework-tethering-stubs.jar"], - stub_srcs: ["sdk_library/public/framework-tethering.srcjar"], - current_api: "sdk_library/public/framework-tethering.txt", - removed_api: "sdk_library/public/framework-tethering-removed.txt", - annotations: "sdk_library/public/framework-tethering_annotations.zip", - sdk_version: "module_current", - }, - system: { - jars: ["sdk_library/system/framework-tethering-stubs.jar"], - stub_srcs: ["sdk_library/system/framework-tethering.srcjar"], - current_api: "sdk_library/system/framework-tethering.txt", - removed_api: "sdk_library/system/framework-tethering-removed.txt", - annotations: "sdk_library/system/framework-tethering_annotations.zip", - sdk_version: "module_current", - }, - module_lib: { - jars: ["sdk_library/module-lib/framework-tethering-stubs.jar"], - stub_srcs: ["sdk_library/module-lib/framework-tethering.srcjar"], - current_api: "sdk_library/module-lib/framework-tethering.txt", - removed_api: "sdk_library/module-lib/framework-tethering-removed.txt", - annotations: "sdk_library/module-lib/framework-tethering_annotations.zip", - sdk_version: "module_current", - }, -} - module_java_sdk_library_import { name: "framework-tethering", // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true. @@ -331,15 +186,6 @@ module_java_sdk_library_import { }, } -java_import { - name: "tethering-module-sdk_service-connectivity@current", - sdk_member_name: "service-connectivity", - visibility: ["//visibility:public"], - apex_available: ["com.android.tethering"], - licenses: ["tethering-module-sdk_Android-Apache-2.0@current"], - jars: ["java_systemserver_libs/snapshot/jars/are/invalid/service-connectivity.jar"], -} - module_java_import { name: "service-connectivity", // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true. @@ -356,29 +202,12 @@ module_java_import { } license { - name: "tethering-module-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: "tethering-module-sdk_Android-Apache-2.0", visibility: ["//visibility:private"], license_kinds: ["SPDX-license-identifier-Apache-2.0"], license_text: ["licenses/build/soong/licenses/LICENSE"], } -prebuilt_systemserverclasspath_fragment { - name: "tethering-module-sdk_com.android.tethering-systemserverclasspath-fragment@current", - sdk_member_name: "com.android.tethering-systemserverclasspath-fragment", - visibility: ["//visibility:public"], - apex_available: ["com.android.tethering"], - licenses: ["tethering-module-sdk_Android-Apache-2.0@current"], - standalone_contents: ["tethering-module-sdk_service-connectivity@current"], -} - module_prebuilt_systemserverclasspath_fragment { name: "com.android.tethering-systemserverclasspath-fragment", // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true. @@ -393,16 +222,3 @@ module_prebuilt_systemserverclasspath_fragment { licenses: ["tethering-module-sdk_Android-Apache-2.0"], standalone_contents: ["service-connectivity"], } - -sdk_snapshot { - name: "tethering-module-sdk@current", - visibility: ["//visibility:public"], - bootclasspath_fragments: ["tethering-module-sdk_com.android.tethering-bootclasspath-fragment@current"], - java_sdk_libs: [ - "tethering-module-sdk_framework-connectivity@current", - "tethering-module-sdk_framework-connectivity-t@current", - "tethering-module-sdk_framework-tethering@current", - ], - java_systemserver_libs: ["tethering-module-sdk_service-connectivity@current"], - systemserverclasspath_fragments: ["tethering-module-sdk_com.android.tethering-systemserverclasspath-fragment@current"], -} |