Snap for 8730993 from 40f81b12cd9557f1242808535f811f6bd0dcb381 to mainline-tzdata3-release
Change-Id: Ia52bf2d958d1578f8259f97ccbd9169921db008b
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 4200a9d..1b29801 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,15 +1,19 @@
drops {
android_build_drop {
- build_id: "T1004135"
- target: "train_build"
- source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.sdkext/sdk/sdkextensions-sdk-current.zip"
+ build_id: "7624795"
+ target: "mainline_modules-user"
+ source_file: "mainline-sdks/sdkextensions-sdk-current.zip"
}
dest_file: "current/current.zip"
version: ""
version_group: ""
git_project: "platform/prebuilts/module_sdk/SdkExtensions"
- git_branch: "tm-dev"
+ git_branch: "sc-dev"
transform: TRANSFORM_UNZIP
transform_options {
+ rename {
+ from_path: "Android.bp"
+ to_path: "Android.bp.auto"
+ }
}
}
diff --git a/2/hiddenapi/all-flags.csv b/2/hiddenapi/all-flags.csv
deleted file mode 100644
index 38b57e0..0000000
--- a/2/hiddenapi/all-flags.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-Landroid/os/ext/SdkExtensions;-><clinit>()V,blocked
-Landroid/os/ext/SdkExtensions;-><init>()V,blocked
-Landroid/os/ext/SdkExtensions;->ALL_EXTENSION_INTS:Ljava/util/Map;,blocked
-Landroid/os/ext/SdkExtensions;->R_EXTENSION_INT:I,blocked
-Landroid/os/ext/SdkExtensions;->S_EXTENSION_INT:I,blocked
-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
-Landroid/os/ext/util/SdkLevel;-><init>()V,blocked
-Landroid/os/ext/util/SdkLevel;->isAtLeastPreReleaseCodename(Ljava/lang/String;)Z,blocked
-Landroid/os/ext/util/SdkLevel;->isAtLeastR()Z,blocked
-Landroid/os/ext/util/SdkLevel;->isAtLeastS()Z,blocked
-Landroid/os/ext/util/SdkLevel;->isAtLeastSv2()Z,blocked
-Landroid/os/ext/util/SdkLevel;->isAtLeastT()Z,blocked
-Landroid/os/ext/util/UnboundedSdkLevel;-><clinit>()V,blocked
-Landroid/os/ext/util/UnboundedSdkLevel;-><init>(ILjava/lang/String;Ljava/util/Set;)V,blocked
-Landroid/os/ext/util/UnboundedSdkLevel;->isAtLeast(Ljava/lang/String;)Z,blocked
-Landroid/os/ext/util/UnboundedSdkLevel;->isAtLeastInternal(Ljava/lang/String;)Z,blocked
-Landroid/os/ext/util/UnboundedSdkLevel;->isAtMost(Ljava/lang/String;)Z,blocked
-Landroid/os/ext/util/UnboundedSdkLevel;->isAtMostInternal(Ljava/lang/String;)Z,blocked
-Landroid/os/ext/util/UnboundedSdkLevel;->isCodename(Ljava/lang/String;)Z,blocked
-Landroid/os/ext/util/UnboundedSdkLevel;->mCodename:Ljava/lang/String;,blocked
-Landroid/os/ext/util/UnboundedSdkLevel;->mIsReleaseBuild:Z,blocked
-Landroid/os/ext/util/UnboundedSdkLevel;->mKnownCodenames:Ljava/util/Set;,blocked
-Landroid/os/ext/util/UnboundedSdkLevel;->mSdkInt:I,blocked
-Landroid/os/ext/util/UnboundedSdkLevel;->sInstance:Landroid/os/ext/util/UnboundedSdkLevel;,blocked
diff --git a/2/hiddenapi/annotation-flags.csv b/2/hiddenapi/annotation-flags.csv
deleted file mode 100644
index e69de29..0000000
--- a/2/hiddenapi/annotation-flags.csv
+++ /dev/null
diff --git a/2/hiddenapi/index.csv b/2/hiddenapi/index.csv
deleted file mode 100644
index 8b13789..0000000
--- a/2/hiddenapi/index.csv
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/2/hiddenapi/metadata.csv b/2/hiddenapi/metadata.csv
deleted file mode 100644
index 8b13789..0000000
--- a/2/hiddenapi/metadata.csv
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/2/hiddenapi/stub-flags.csv b/2/hiddenapi/stub-flags.csv
deleted file mode 100644
index 1d63606..0000000
--- a/2/hiddenapi/stub-flags.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-Landroid/os/ext/SdkExtensions;-><clinit>()V
-Landroid/os/ext/SdkExtensions;-><init>()V
-Landroid/os/ext/SdkExtensions;->ALL_EXTENSION_INTS:Ljava/util/Map;
-Landroid/os/ext/SdkExtensions;->R_EXTENSION_INT:I
-Landroid/os/ext/SdkExtensions;->S_EXTENSION_INT:I
-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
-Landroid/os/ext/util/SdkLevel;-><init>()V
-Landroid/os/ext/util/SdkLevel;->isAtLeastPreReleaseCodename(Ljava/lang/String;)Z
-Landroid/os/ext/util/SdkLevel;->isAtLeastR()Z
-Landroid/os/ext/util/SdkLevel;->isAtLeastS()Z
-Landroid/os/ext/util/SdkLevel;->isAtLeastSv2()Z
-Landroid/os/ext/util/SdkLevel;->isAtLeastT()Z
-Landroid/os/ext/util/UnboundedSdkLevel;-><clinit>()V
-Landroid/os/ext/util/UnboundedSdkLevel;-><init>(ILjava/lang/String;Ljava/util/Set;)V
-Landroid/os/ext/util/UnboundedSdkLevel;->isAtLeast(Ljava/lang/String;)Z
-Landroid/os/ext/util/UnboundedSdkLevel;->isAtLeastInternal(Ljava/lang/String;)Z
-Landroid/os/ext/util/UnboundedSdkLevel;->isAtMost(Ljava/lang/String;)Z
-Landroid/os/ext/util/UnboundedSdkLevel;->isAtMostInternal(Ljava/lang/String;)Z
-Landroid/os/ext/util/UnboundedSdkLevel;->isCodename(Ljava/lang/String;)Z
-Landroid/os/ext/util/UnboundedSdkLevel;->mCodename:Ljava/lang/String;
-Landroid/os/ext/util/UnboundedSdkLevel;->mIsReleaseBuild:Z
-Landroid/os/ext/util/UnboundedSdkLevel;->mKnownCodenames:Ljava/util/Set;
-Landroid/os/ext/util/UnboundedSdkLevel;->mSdkInt:I
-Landroid/os/ext/util/UnboundedSdkLevel;->sInstance:Landroid/os/ext/util/UnboundedSdkLevel;
diff --git a/2/licenses/build/soong/licenses/LICENSE b/2/licenses/build/soong/licenses/LICENSE
deleted file mode 100644
index dae0406..0000000
--- a/2/licenses/build/soong/licenses/LICENSE
+++ /dev/null
@@ -1,214 +0,0 @@
-
- Copyright (c) The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
-
- 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.
-
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
diff --git a/2/sdk_library/module-lib/framework-sdkextensions-removed.txt b/2/sdk_library/module-lib/framework-sdkextensions-removed.txt
deleted file mode 100644
index d802177..0000000
--- a/2/sdk_library/module-lib/framework-sdkextensions-removed.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/2/sdk_library/module-lib/framework-sdkextensions-stubs.jar b/2/sdk_library/module-lib/framework-sdkextensions-stubs.jar
deleted file mode 100644
index 2f3276c..0000000
--- a/2/sdk_library/module-lib/framework-sdkextensions-stubs.jar
+++ /dev/null
Binary files differ
diff --git a/2/sdk_library/module-lib/framework-sdkextensions.srcjar b/2/sdk_library/module-lib/framework-sdkextensions.srcjar
deleted file mode 100644
index bb5d0b1..0000000
--- a/2/sdk_library/module-lib/framework-sdkextensions.srcjar
+++ /dev/null
Binary files differ
diff --git a/2/sdk_library/module-lib/framework-sdkextensions.txt b/2/sdk_library/module-lib/framework-sdkextensions.txt
deleted file mode 100644
index d802177..0000000
--- a/2/sdk_library/module-lib/framework-sdkextensions.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/2/sdk_library/module-lib/framework-sdkextensions_annotations.zip b/2/sdk_library/module-lib/framework-sdkextensions_annotations.zip
deleted file mode 100644
index 3e5cb98..0000000
--- a/2/sdk_library/module-lib/framework-sdkextensions_annotations.zip
+++ /dev/null
Binary files differ
diff --git a/2/sdk_library/public/framework-sdkextensions-removed.txt b/2/sdk_library/public/framework-sdkextensions-removed.txt
deleted file mode 100644
index d802177..0000000
--- a/2/sdk_library/public/framework-sdkextensions-removed.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/2/sdk_library/public/framework-sdkextensions-stubs.jar b/2/sdk_library/public/framework-sdkextensions-stubs.jar
deleted file mode 100644
index feebb37..0000000
--- a/2/sdk_library/public/framework-sdkextensions-stubs.jar
+++ /dev/null
Binary files differ
diff --git a/2/sdk_library/public/framework-sdkextensions.srcjar b/2/sdk_library/public/framework-sdkextensions.srcjar
deleted file mode 100644
index 117eb80..0000000
--- a/2/sdk_library/public/framework-sdkextensions.srcjar
+++ /dev/null
Binary files differ
diff --git a/2/sdk_library/public/framework-sdkextensions.txt b/2/sdk_library/public/framework-sdkextensions.txt
deleted file mode 100644
index 180afea..0000000
--- a/2/sdk_library/public/framework-sdkextensions.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-// Signature format: 2.0
-package android.os.ext {
-
- public class SdkExtensions {
- method @NonNull public static java.util.Map<java.lang.Integer,java.lang.Integer> getAllExtensionVersions();
- method public static int getExtensionVersion(int);
- }
-
-}
-
diff --git a/2/sdk_library/public/framework-sdkextensions_annotations.zip b/2/sdk_library/public/framework-sdkextensions_annotations.zip
deleted file mode 100644
index 3e5cb98..0000000
--- a/2/sdk_library/public/framework-sdkextensions_annotations.zip
+++ /dev/null
Binary files differ
diff --git a/2/sdk_library/system/framework-sdkextensions-removed.txt b/2/sdk_library/system/framework-sdkextensions-removed.txt
deleted file mode 100644
index d802177..0000000
--- a/2/sdk_library/system/framework-sdkextensions-removed.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/2/sdk_library/system/framework-sdkextensions-stubs.jar b/2/sdk_library/system/framework-sdkextensions-stubs.jar
deleted file mode 100644
index 2f3276c..0000000
--- a/2/sdk_library/system/framework-sdkextensions-stubs.jar
+++ /dev/null
Binary files differ
diff --git a/2/sdk_library/system/framework-sdkextensions.srcjar b/2/sdk_library/system/framework-sdkextensions.srcjar
deleted file mode 100644
index bb5d0b1..0000000
--- a/2/sdk_library/system/framework-sdkextensions.srcjar
+++ /dev/null
Binary files differ
diff --git a/2/sdk_library/system/framework-sdkextensions.txt b/2/sdk_library/system/framework-sdkextensions.txt
deleted file mode 100644
index d802177..0000000
--- a/2/sdk_library/system/framework-sdkextensions.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/2/sdk_library/system/framework-sdkextensions_annotations.zip b/2/sdk_library/system/framework-sdkextensions_annotations.zip
deleted file mode 100644
index 3e5cb98..0000000
--- a/2/sdk_library/system/framework-sdkextensions_annotations.zip
+++ /dev/null
Binary files differ
diff --git a/3/hiddenapi/annotation-flags.csv b/3/hiddenapi/annotation-flags.csv
deleted file mode 100644
index e69de29..0000000
--- a/3/hiddenapi/annotation-flags.csv
+++ /dev/null
diff --git a/3/hiddenapi/filtered-flags.csv b/3/hiddenapi/filtered-flags.csv
deleted file mode 100644
index 1f23e40..0000000
--- a/3/hiddenapi/filtered-flags.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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/3/hiddenapi/filtered-stub-flags.csv b/3/hiddenapi/filtered-stub-flags.csv
deleted file mode 100644
index 0d260f0..0000000
--- a/3/hiddenapi/filtered-stub-flags.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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/3/hiddenapi/index.csv b/3/hiddenapi/index.csv
deleted file mode 100644
index 8b13789..0000000
--- a/3/hiddenapi/index.csv
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/3/hiddenapi/metadata.csv b/3/hiddenapi/metadata.csv
deleted file mode 100644
index 8b13789..0000000
--- a/3/hiddenapi/metadata.csv
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/3/hiddenapi/signature-patterns.csv b/3/hiddenapi/signature-patterns.csv
deleted file mode 100644
index c398f75..0000000
--- a/3/hiddenapi/signature-patterns.csv
+++ /dev/null
@@ -1 +0,0 @@
-android/os/ext/**
diff --git a/3/licenses/build/soong/licenses/LICENSE b/3/licenses/build/soong/licenses/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/3/licenses/build/soong/licenses/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
diff --git a/3/sdk_library/module-lib/framework-sdkextensions-removed.txt b/3/sdk_library/module-lib/framework-sdkextensions-removed.txt
deleted file mode 100644
index d802177..0000000
--- a/3/sdk_library/module-lib/framework-sdkextensions-removed.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/3/sdk_library/module-lib/framework-sdkextensions-stubs.jar b/3/sdk_library/module-lib/framework-sdkextensions-stubs.jar
deleted file mode 100644
index 2f3276c..0000000
--- a/3/sdk_library/module-lib/framework-sdkextensions-stubs.jar
+++ /dev/null
Binary files differ
diff --git a/3/sdk_library/module-lib/framework-sdkextensions.srcjar b/3/sdk_library/module-lib/framework-sdkextensions.srcjar
deleted file mode 100644
index bb5d0b1..0000000
--- a/3/sdk_library/module-lib/framework-sdkextensions.srcjar
+++ /dev/null
Binary files differ
diff --git a/3/sdk_library/module-lib/framework-sdkextensions.txt b/3/sdk_library/module-lib/framework-sdkextensions.txt
deleted file mode 100644
index d802177..0000000
--- a/3/sdk_library/module-lib/framework-sdkextensions.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/3/sdk_library/module-lib/framework-sdkextensions_annotations.zip b/3/sdk_library/module-lib/framework-sdkextensions_annotations.zip
deleted file mode 100644
index a299d90..0000000
--- a/3/sdk_library/module-lib/framework-sdkextensions_annotations.zip
+++ /dev/null
Binary files differ
diff --git a/3/sdk_library/public/framework-sdkextensions-removed.txt b/3/sdk_library/public/framework-sdkextensions-removed.txt
deleted file mode 100644
index d802177..0000000
--- a/3/sdk_library/public/framework-sdkextensions-removed.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/3/sdk_library/public/framework-sdkextensions-stubs.jar b/3/sdk_library/public/framework-sdkextensions-stubs.jar
deleted file mode 100644
index 1aed235..0000000
--- a/3/sdk_library/public/framework-sdkextensions-stubs.jar
+++ /dev/null
Binary files differ
diff --git a/3/sdk_library/public/framework-sdkextensions.srcjar b/3/sdk_library/public/framework-sdkextensions.srcjar
deleted file mode 100644
index 73a09f5..0000000
--- a/3/sdk_library/public/framework-sdkextensions.srcjar
+++ /dev/null
Binary files differ
diff --git a/3/sdk_library/public/framework-sdkextensions.txt b/3/sdk_library/public/framework-sdkextensions.txt
deleted file mode 100644
index 180afea..0000000
--- a/3/sdk_library/public/framework-sdkextensions.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-// Signature format: 2.0
-package android.os.ext {
-
- public class SdkExtensions {
- method @NonNull public static java.util.Map<java.lang.Integer,java.lang.Integer> getAllExtensionVersions();
- method public static int getExtensionVersion(int);
- }
-
-}
-
diff --git a/3/sdk_library/public/framework-sdkextensions_annotations.zip b/3/sdk_library/public/framework-sdkextensions_annotations.zip
deleted file mode 100644
index a299d90..0000000
--- a/3/sdk_library/public/framework-sdkextensions_annotations.zip
+++ /dev/null
Binary files differ
diff --git a/3/sdk_library/system/framework-sdkextensions-removed.txt b/3/sdk_library/system/framework-sdkextensions-removed.txt
deleted file mode 100644
index d802177..0000000
--- a/3/sdk_library/system/framework-sdkextensions-removed.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/3/sdk_library/system/framework-sdkextensions-stubs.jar b/3/sdk_library/system/framework-sdkextensions-stubs.jar
deleted file mode 100644
index 2f3276c..0000000
--- a/3/sdk_library/system/framework-sdkextensions-stubs.jar
+++ /dev/null
Binary files differ
diff --git a/3/sdk_library/system/framework-sdkextensions.srcjar b/3/sdk_library/system/framework-sdkextensions.srcjar
deleted file mode 100644
index bb5d0b1..0000000
--- a/3/sdk_library/system/framework-sdkextensions.srcjar
+++ /dev/null
Binary files differ
diff --git a/3/sdk_library/system/framework-sdkextensions.txt b/3/sdk_library/system/framework-sdkextensions.txt
deleted file mode 100644
index d802177..0000000
--- a/3/sdk_library/system/framework-sdkextensions.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/3/sdk_library/system/framework-sdkextensions_annotations.zip b/3/sdk_library/system/framework-sdkextensions_annotations.zip
deleted file mode 100644
index a299d90..0000000
--- a/3/sdk_library/system/framework-sdkextensions_annotations.zip
+++ /dev/null
Binary files differ
diff --git a/3/snapshot-creation-build-number.txt b/3/snapshot-creation-build-number.txt
deleted file mode 100644
index 46fc4d1..0000000
--- a/3/snapshot-creation-build-number.txt
+++ /dev/null
@@ -1 +0,0 @@
-8636759
\ No newline at end of file
diff --git a/current/Android.bp b/current/Android.bp
index a4fa13a..6333523 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.
@@ -22,48 +13,28 @@
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: {
+ stub_flags: "hiddenapi/stub-flags.csv",
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",
+ all_flags: "hiddenapi/all-flags.csv",
},
}
-module_prebuilt_bootclasspath_fragment {
+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,
- },
- },
+ prefer: false,
visibility: ["//packages/modules/SdkExtensions:__subpackages__"],
apex_available: ["com.android.sdkext"],
licenses: ["sdkextensions-sdk_Android-Apache-2.0"],
contents: ["framework-sdkextensions"],
- fragments: [
- {
- apex: "com.android.art",
- module: "art-bootclasspath-fragment",
- },
- ],
hidden_api: {
+ stub_flags: "hiddenapi/stub-flags.csv",
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",
+ all_flags: "hiddenapi/all-flags.csv",
},
}
@@ -83,7 +54,6 @@
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: {
@@ -91,7 +61,6 @@
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: {
@@ -99,20 +68,13 @@
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 {
+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,
- },
- },
+ prefer: false,
visibility: ["//visibility:public"],
apex_available: [
"com.android.sdkext",
@@ -126,7 +88,6 @@
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: {
@@ -134,7 +95,6 @@
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: {
@@ -142,7 +102,6 @@
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",
},
}
diff --git a/3/Android.bp.auto b/current/Android.bp.auto
old mode 100644
new mode 100755
similarity index 71%
rename from 3/Android.bp.auto
rename to current/Android.bp.auto
index a4fa13a..6333523
--- a/3/Android.bp.auto
+++ b/current/Android.bp.auto
@@ -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.
@@ -22,48 +13,28 @@
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: {
+ stub_flags: "hiddenapi/stub-flags.csv",
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",
+ all_flags: "hiddenapi/all-flags.csv",
},
}
-module_prebuilt_bootclasspath_fragment {
+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,
- },
- },
+ prefer: false,
visibility: ["//packages/modules/SdkExtensions:__subpackages__"],
apex_available: ["com.android.sdkext"],
licenses: ["sdkextensions-sdk_Android-Apache-2.0"],
contents: ["framework-sdkextensions"],
- fragments: [
- {
- apex: "com.android.art",
- module: "art-bootclasspath-fragment",
- },
- ],
hidden_api: {
+ stub_flags: "hiddenapi/stub-flags.csv",
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",
+ all_flags: "hiddenapi/all-flags.csv",
},
}
@@ -83,7 +54,6 @@
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: {
@@ -91,7 +61,6 @@
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: {
@@ -99,20 +68,13 @@
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 {
+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,
- },
- },
+ prefer: false,
visibility: ["//visibility:public"],
apex_available: [
"com.android.sdkext",
@@ -126,7 +88,6 @@
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: {
@@ -134,7 +95,6 @@
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: {
@@ -142,7 +102,6 @@
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",
},
}
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
deleted file mode 100644
index 1f23e40..0000000
--- a/current/hiddenapi/filtered-flags.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 0d260f0..0000000
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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/hiddenapi/signature-patterns.csv b/current/hiddenapi/signature-patterns.csv
deleted file mode 100644
index c398f75..0000000
--- a/current/hiddenapi/signature-patterns.csv
+++ /dev/null
@@ -1 +0,0 @@
-android/os/ext/**
diff --git a/current/licenses/build/soong/licenses/LICENSE b/current/licenses/build/soong/licenses/LICENSE
index d645695..dae0406 100644
--- a/current/licenses/build/soong/licenses/LICENSE
+++ b/current/licenses/build/soong/licenses/LICENSE
@@ -1,4 +1,16 @@
+ Copyright (c) The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+
+ 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.
+
+
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
diff --git a/current/sdk_library/module-lib/framework-sdkextensions_annotations.zip b/current/sdk_library/module-lib/framework-sdkextensions_annotations.zip
deleted file mode 100644
index a299d90..0000000
--- a/current/sdk_library/module-lib/framework-sdkextensions_annotations.zip
+++ /dev/null
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..b62b671 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..b62b671 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..d802177 100644
--- a/current/sdk_library/public/framework-sdkextensions.txt
+++ b/current/sdk_library/public/framework-sdkextensions.txt
@@ -1,10 +1 @@
// Signature format: 2.0
-package android.os.ext {
-
- public class SdkExtensions {
- method @NonNull public static java.util.Map<java.lang.Integer,java.lang.Integer> getAllExtensionVersions();
- method public static int getExtensionVersion(int);
- }
-
-}
-
diff --git a/current/sdk_library/public/framework-sdkextensions_annotations.zip b/current/sdk_library/public/framework-sdkextensions_annotations.zip
deleted file mode 100644
index a299d90..0000000
--- a/current/sdk_library/public/framework-sdkextensions_annotations.zip
+++ /dev/null
Binary files differ
diff --git a/current/sdk_library/system/framework-sdkextensions.txt b/current/sdk_library/system/framework-sdkextensions.txt
index d802177..180afea 100644
--- a/current/sdk_library/system/framework-sdkextensions.txt
+++ b/current/sdk_library/system/framework-sdkextensions.txt
@@ -1 +1,10 @@
// Signature format: 2.0
+package android.os.ext {
+
+ public class SdkExtensions {
+ method @NonNull public static java.util.Map<java.lang.Integer,java.lang.Integer> getAllExtensionVersions();
+ method public static int getExtensionVersion(int);
+ }
+
+}
+
diff --git a/current/sdk_library/system/framework-sdkextensions_annotations.zip b/current/sdk_library/system/framework-sdkextensions_annotations.zip
deleted file mode 100644
index a299d90..0000000
--- a/current/sdk_library/system/framework-sdkextensions_annotations.zip
+++ /dev/null
Binary files differ
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
deleted file mode 100644
index c749d4d..0000000
--- a/current/snapshot-creation-build-number.txt
+++ /dev/null
@@ -1 +0,0 @@
-8627787
\ No newline at end of file
