Snap for 8358640 from c2345c708e0cb3a15276415e0e51c943c705ebcd to mainline-go-cellbroadcast-release

Change-Id: Id12011f36103157b3a7509fbde4408d83f0bef1c

9 files changed, 39 insertions, 212 deletions

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 484e599..b844f40 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,6 +1,6 @@
 drops {
   android_build_drop {
-    build_id: "7653768"
+    build_id: "7542407"
     target: "mainline_modules-user"
     source_file: "mainline-sdks/tethering-module-sdk-current.zip"
   }
@@ -10,10 +10,4 @@ drops {
   git_project: "platform/prebuilts/module_sdk/Connectivity"
   git_branch: "sc-dev"
   transform: TRANSFORM_UNZIP
-  transform_options {
-    rename {
-      from_path: "Android.bp"
-      to_path: "Android.bp.auto"
-    }
-  }
 }
diff --git a/current/Android.bp b/current/Android.bp
index c8ecddf..586b79b 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -6,6 +6,14 @@ package {
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
+soong_config_module_type_import {
+    from: "packages/modules/common/Android.bp",
+    module_types: [
+        "module_java_sdk_library_import",
+        "module_prebuilt_bootclasspath_fragment",
+    ],
+}
+
 prebuilt_bootclasspath_fragment {
     name: "tethering-module-sdk_com.android.tethering-bootclasspath-fragment@current",
     sdk_member_name: "com.android.tethering-bootclasspath-fragment",
@@ -27,9 +35,14 @@ prebuilt_bootclasspath_fragment {
     },
 }
 
-prebuilt_bootclasspath_fragment {
+module_prebuilt_bootclasspath_fragment {
     name: "com.android.tethering-bootclasspath-fragment",
     prefer: false,
+    soong_config_variables: {
+        module_build_from_source: {
+            prefer: false,
+        },
+    },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.tethering"],
     licenses: ["tethering-module-sdk_Android-Apache-2.0"],
@@ -55,12 +68,12 @@ java_sdk_library_import {
     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: {
@@ -68,6 +81,7 @@ java_sdk_library_import {
         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: {
@@ -75,23 +89,29 @@ java_sdk_library_import {
         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",
     },
 }
 
-java_sdk_library_import {
+module_java_sdk_library_import {
     name: "framework-connectivity",
     prefer: false,
+    soong_config_variables: {
+        module_build_from_source: {
+            prefer: false,
+        },
+    },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.tethering"],
     licenses: ["tethering-module-sdk_Android-Apache-2.0"],
     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: {
@@ -99,6 +119,7 @@ java_sdk_library_import {
         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: {
@@ -106,6 +127,7 @@ java_sdk_library_import {
         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",
     },
 }
@@ -117,12 +139,12 @@ java_sdk_library_import {
     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: {
@@ -130,6 +152,7 @@ java_sdk_library_import {
         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: {
@@ -137,23 +160,29 @@ java_sdk_library_import {
         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",
     },
 }
 
-java_sdk_library_import {
+module_java_sdk_library_import {
     name: "framework-tethering",
     prefer: false,
+    soong_config_variables: {
+        module_build_from_source: {
+            prefer: false,
+        },
+    },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.tethering"],
     licenses: ["tethering-module-sdk_Android-Apache-2.0"],
     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: {
@@ -161,6 +190,7 @@ java_sdk_library_import {
         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: {
@@ -168,6 +198,7 @@ java_sdk_library_import {
         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",
     },
 }
diff --git a/current/Android.bp.auto b/current/Android.bp.auto
deleted file mode 100755
index c8ecddf..0000000
--- a/current/Android.bp.auto
+++ /dev/null
@@ -1,198 +0,0 @@
-// This is auto-generated. DO NOT EDIT.
-
-package {
-    // A default list here prevents the license LSC from adding its own list which would
-    // be unnecessary as every module in the sdk already has its own licenses property.
-    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-tethering@current",
-    ],
-    hidden_api: {
-        unsupported: ["hiddenapi/hiddenapi-unsupported.txt"],
-        max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"],
-        stub_flags: "hiddenapi/stub-flags.csv",
-        annotation_flags: "hiddenapi/annotation-flags.csv",
-        metadata: "hiddenapi/metadata.csv",
-        index: "hiddenapi/index.csv",
-        all_flags: "hiddenapi/all-flags.csv",
-    },
-}
-
-prebuilt_bootclasspath_fragment {
-    name: "com.android.tethering-bootclasspath-fragment",
-    prefer: false,
-    visibility: ["//visibility:public"],
-    apex_available: ["com.android.tethering"],
-    licenses: ["tethering-module-sdk_Android-Apache-2.0"],
-    contents: [
-        "framework-connectivity",
-        "framework-tethering",
-    ],
-    hidden_api: {
-        unsupported: ["hiddenapi/hiddenapi-unsupported.txt"],
-        max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"],
-        stub_flags: "hiddenapi/stub-flags.csv",
-        annotation_flags: "hiddenapi/annotation-flags.csv",
-        metadata: "hiddenapi/metadata.csv",
-        index: "hiddenapi/index.csv",
-        all_flags: "hiddenapi/all-flags.csv",
-    },
-}
-
-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",
-        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",
-        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",
-        sdk_version: "module_current",
-    },
-}
-
-java_sdk_library_import {
-    name: "framework-connectivity",
-    prefer: false,
-    visibility: ["//visibility:public"],
-    apex_available: ["com.android.tethering"],
-    licenses: ["tethering-module-sdk_Android-Apache-2.0"],
-    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",
-        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",
-        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",
-        sdk_version: "module_current",
-    },
-}
-
-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",
-        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",
-        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",
-        sdk_version: "module_current",
-    },
-}
-
-java_sdk_library_import {
-    name: "framework-tethering",
-    prefer: false,
-    visibility: ["//visibility:public"],
-    apex_available: ["com.android.tethering"],
-    licenses: ["tethering-module-sdk_Android-Apache-2.0"],
-    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",
-        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",
-        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",
-        sdk_version: "module_current",
-    },
-}
-
-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"],
-}
-
-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-tethering@current",
-    ],
-}
diff --git a/current/sdk_library/module-lib/framework-connectivity_annotations.zip b/current/sdk_library/module-lib/framework-connectivity_annotations.zip
new file mode 100644
index 0000000..4f106df
--- /dev/null
+++ b/current/sdk_library/module-lib/framework-connectivity_annotations.zip
diff --git a/current/sdk_library/module-lib/framework-tethering_annotations.zip b/current/sdk_library/module-lib/framework-tethering_annotations.zip
new file mode 100644
index 0000000..3dabacc
--- /dev/null
+++ b/current/sdk_library/module-lib/framework-tethering_annotations.zip
diff --git a/current/sdk_library/public/framework-connectivity_annotations.zip b/current/sdk_library/public/framework-connectivity_annotations.zip
new file mode 100644
index 0000000..35d11ca
--- /dev/null
+++ b/current/sdk_library/public/framework-connectivity_annotations.zip
diff --git a/current/sdk_library/public/framework-tethering_annotations.zip b/current/sdk_library/public/framework-tethering_annotations.zip
new file mode 100644
index 0000000..15cb0ec
--- /dev/null
+++ b/current/sdk_library/public/framework-tethering_annotations.zip
diff --git a/current/sdk_library/system/framework-connectivity_annotations.zip b/current/sdk_library/system/framework-connectivity_annotations.zip
new file mode 100644
index 0000000..f7b7020
--- /dev/null
+++ b/current/sdk_library/system/framework-connectivity_annotations.zip
diff --git a/current/sdk_library/system/framework-tethering_annotations.zip b/current/sdk_library/system/framework-tethering_annotations.zip
new file mode 100644
index 0000000..d3235a5
--- /dev/null
+++ b/current/sdk_library/system/framework-tethering_annotations.zip