diff options
| author | Paul Duffin <paulduffin@google.com> | 2022-08-23 11:59:46 +0000 |
|---|---|---|
| committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | 2022-09-13 11:37:50 +0000 |
| commit | ee64f4c6b17de4f1de362e52ac42ee3cc289907f (patch) | |
| tree | ad6a2f8256cc5a618f25ca3c5bbcc10f01ea77b9 | |
| parent | d5e1058d4e6271ddae0b4514738da41fcc39e7d9 (diff) | |
| download | okhttp-ee64f4c6b17de4f1de362e52ac42ee3cc289907f.tar.gz | |
Include okhttp-norepackage in sdk snapshot for S+
Previously, the sdk snapshot would include all modules listed as
members for each build release even when the module specified that
it was not suitable for that release, by virtue of having a
min_sdk_version > target build release. A follow up change in
build/soong will exclude any module whose min_sdk_version > target
build release from the sdk snapshot for that build release.
Unfortunately, not every sdk member has a min_sdk_version specified. In
that case it defaults to use the sdk_version and if that is not
specified then it defaults to the "current" API level. Modules that are
also part of an updatable APEX are required to have a min_sdk_version
but other modules are not which means that those modules will not
appear in any snapshot other than the latest one.
This change adds a min_sdk_version: "S" property to the
okhttp-norepackage library to make sure that it will continue to be
included in the sdk snapshot for S+ once the follow up change is
applied.
Bug: 240406019
Test: packages/modules/common/build/mainline_modules_sdks.sh
# Ran the previous command with and without this change to make
# sure that this change does not change the sdk snapshot
# contents. Also ran the previous command with the follow up
# change in build/soong to make sure that it does not change the
# sdk snapshot either.
Change-Id: I3fc3dfe867bd7687585cc16078c6b68b58190eb4
(cherry picked from commit 6ae7083ae1677a164b48d4b2713bf9a06a535b0e)
Merged-In: I3fc3dfe867bd7687585cc16078c6b68b58190eb4
| -rw-r--r-- | Android.bp | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -164,6 +164,8 @@ java_library { // Build against a "core_current" as it cannot use "current" as it has to // build in manifests without frameworks/base. sdk_version: "core_current", + // Make sure that this will be added to the sdk snapshot for S. + min_sdk_version: "S", } // Generate Version.java based on the version number from pom.xml. |