Google Git
Sign in
android/platform/prebuilts/module_sdk/SdkExtensions/refs/heads/android13-qpr3-c-s1-release^!/.
commit
f59307a9f86fd5624117cab8243ad70c3fb452cd
[log]
author
Bob Hanji <[email protected]>
Fri Mar 17 15:43:00 2023 +0000
committer
Paul Duffin <[email protected]>
Wed Mar 22 13:50:52 2023 +0000
tree
d41f506bb626ae6a6dd6a9f54256c5ac8f538b5d
parent
094a0441e996a3a1cfff8f6c2a31b96f74d91dda [diff]
DO NOT MERGE: Drop prebuilt files to android source tree.

The following files have been updated as part of this change:

current/Android.bp
current/snapshot-creation-build-number.txt
current/sdk_library/module-lib/framework-sdkextensions-removed.txt
current/sdk_library/module-lib/framework-sdkextensions-stubs.jar
current/sdk_library/module-lib/framework-sdkextensions.srcjar
current/sdk_library/module-lib/framework-sdkextensions.txt
current/sdk_library/module-lib/framework-sdkextensions_annotations.zip
current/sdk_library/system/framework-sdkextensions-removed.txt
current/sdk_library/system/framework-sdkextensions-stubs.jar
current/sdk_library/system/framework-sdkextensions.srcjar
current/sdk_library/system/framework-sdkextensions.txt
current/sdk_library/system/framework-sdkextensions_annotations.zip
current/sdk_library/public/framework-sdkextensions-removed.txt
current/sdk_library/public/framework-sdkextensions-stubs.jar
current/sdk_library/public/framework-sdkextensions.srcjar
current/sdk_library/public/framework-sdkextensions.txt
current/sdk_library/public/framework-sdkextensions_annotations.zip
current/licenses/build/soong/licenses/LICENSE
current/hiddenapi/annotation-flags.csv
current/hiddenapi/filtered-flags.csv
current/hiddenapi/filtered-stub-flags.csv
current/hiddenapi/index.csv
current/hiddenapi/metadata.csv
current/hiddenapi/signature-patterns.csv

Built here: ab/T1005628

This build IS suitable for public release.

The change is generated with prebuilt drop tool.

Test: presubmit
Bug: 269790979
Change-Id: I51939b59deac86de06d3437d5fb122047d257c0d
Merged-In: I844cdf9766c0a618ab5429838e7f3efb9a7f86af

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index f8ea365..a61b4ed 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: "T1005032"
+    build_id: "T1005628"
     target: "train_build"
     source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.sdkext/sdk/sdkextensions-sdk-current.zip"
   }

diff --git a/current/Android.bp b/current/Android.bp
index a4fa13a..0b3d882 100644
--- a/current/Android.bp
+++ b/current/Android.bp

@@ -1,14 +1,5 @@
 // This is auto-generated. DO NOT EDIT.
 
-// Soong config variable stanza added by vendor/google/build/mainline_modules_sdks.py.
-soong_config_module_type_import {
-    from: "packages/modules/common/Android.bp",
-    module_types: [
-        "module_java_sdk_library_import",
-        "module_prebuilt_bootclasspath_fragment",
-    ],
-}
-
 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.
@@ -16,36 +7,11 @@
 }
 
 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.
-    prefer: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
+    use_source_config_var: {
+        config_namespace: "ANDROID",
+        var_name: "module_build_from_source",
     },
     visibility: ["//packages/modules/SdkExtensions:__subpackages__"],
     apex_available: ["com.android.sdkext"],
@@ -68,50 +34,11 @@
 }
 
 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.
-    prefer: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
+    use_source_config_var: {
+        config_namespace: "ANDROID",
+        var_name: "module_build_from_source",
     },
     visibility: ["//visibility:public"],
     apex_available: [
@@ -148,23 +75,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"],
-}

diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index 1f23e40..f7569d8 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv

@@ -1,2 +1,3 @@
+Landroid/os/ext/SdkExtensions;->AD_SERVICES:I,public-api,sdk,system-api,test-api
 Landroid/os/ext/SdkExtensions;->getAllExtensionVersions()Ljava/util/Map;,public-api,sdk,system-api,test-api
 Landroid/os/ext/SdkExtensions;->getExtensionVersion(I)I,public-api,sdk,system-api,test-api

diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
index 0d260f0..9a6dcc2 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv

@@ -1,2 +1,3 @@
+Landroid/os/ext/SdkExtensions;->AD_SERVICES:I,public-api,system-api,test-api
 Landroid/os/ext/SdkExtensions;->getAllExtensionVersions()Ljava/util/Map;,public-api,system-api,test-api
 Landroid/os/ext/SdkExtensions;->getExtensionVersion(I)I,public-api,system-api,test-api

diff --git a/current/sdk_library/module-lib/framework-sdkextensions-stubs.jar b/current/sdk_library/module-lib/framework-sdkextensions-stubs.jar
index 2f3276c..85c2fbb 100644
--- a/current/sdk_library/module-lib/framework-sdkextensions-stubs.jar
+++ b/current/sdk_library/module-lib/framework-sdkextensions-stubs.jar
Binary files differ

diff --git a/current/sdk_library/module-lib/framework-sdkextensions.srcjar b/current/sdk_library/module-lib/framework-sdkextensions.srcjar
index bb5d0b1..89fc0b9 100644
--- a/current/sdk_library/module-lib/framework-sdkextensions.srcjar
+++ b/current/sdk_library/module-lib/framework-sdkextensions.srcjar
Binary files differ

diff --git a/current/sdk_library/module-lib/framework-sdkextensions_annotations.zip b/current/sdk_library/module-lib/framework-sdkextensions_annotations.zip
index a299d90..071a342 100644
--- a/current/sdk_library/module-lib/framework-sdkextensions_annotations.zip
+++ b/current/sdk_library/module-lib/framework-sdkextensions_annotations.zip
Binary files differ

diff --git a/current/sdk_library/public/framework-sdkextensions-stubs.jar b/current/sdk_library/public/framework-sdkextensions-stubs.jar
index 1aed235..6a7abf7 100644
--- a/current/sdk_library/public/framework-sdkextensions-stubs.jar
+++ b/current/sdk_library/public/framework-sdkextensions-stubs.jar
Binary files differ

diff --git a/current/sdk_library/public/framework-sdkextensions.srcjar b/current/sdk_library/public/framework-sdkextensions.srcjar
index 73a09f5..620f2eb 100644
--- a/current/sdk_library/public/framework-sdkextensions.srcjar
+++ b/current/sdk_library/public/framework-sdkextensions.srcjar
Binary files differ

diff --git a/current/sdk_library/public/framework-sdkextensions.txt b/current/sdk_library/public/framework-sdkextensions.txt
index 180afea..75b43ba 100644
--- a/current/sdk_library/public/framework-sdkextensions.txt
+++ b/current/sdk_library/public/framework-sdkextensions.txt

@@ -4,6 +4,7 @@
   public class SdkExtensions {
     method @NonNull public static java.util.Map<java.lang.Integer,java.lang.Integer> getAllExtensionVersions();
     method public static int getExtensionVersion(int);
+    field public static final int AD_SERVICES = 1000000; // 0xf4240
   }
 
 }

diff --git a/current/sdk_library/public/framework-sdkextensions_annotations.zip b/current/sdk_library/public/framework-sdkextensions_annotations.zip
index a299d90..071a342 100644
--- a/current/sdk_library/public/framework-sdkextensions_annotations.zip
+++ b/current/sdk_library/public/framework-sdkextensions_annotations.zip
Binary files differ

diff --git a/current/sdk_library/system/framework-sdkextensions-stubs.jar b/current/sdk_library/system/framework-sdkextensions-stubs.jar
index 2f3276c..85c2fbb 100644
--- a/current/sdk_library/system/framework-sdkextensions-stubs.jar
+++ b/current/sdk_library/system/framework-sdkextensions-stubs.jar
Binary files differ

diff --git a/current/sdk_library/system/framework-sdkextensions.srcjar b/current/sdk_library/system/framework-sdkextensions.srcjar
index bb5d0b1..89fc0b9 100644
--- a/current/sdk_library/system/framework-sdkextensions.srcjar
+++ b/current/sdk_library/system/framework-sdkextensions.srcjar
Binary files differ

diff --git a/current/sdk_library/system/framework-sdkextensions_annotations.zip b/current/sdk_library/system/framework-sdkextensions_annotations.zip
index a299d90..071a342 100644
--- a/current/sdk_library/system/framework-sdkextensions_annotations.zip
+++ b/current/sdk_library/system/framework-sdkextensions_annotations.zip
Binary files differ

diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index 7c72ea0..95563f3 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt

@@ -1 +1 @@
-9160325
\ No newline at end of file
+9368779
\ No newline at end of file