Commit graph

28 commits

Author SHA1 Message Date
Treehugger Robot
6a6e7731be Merge "Filter REL out of preview codenames." into main 2023-10-09 20:34:07 +00:00
Dan Albert
2610a328ce Filter REL out of preview codenames.
Relanding https://r.android.com/2773148 in a different way, since
removing REL from ALL_CODENAMES prevents -next builds from booting
(see the comment for the code that relies on this behavior).

This reverts commit d637190deb.

Bug: http://b/303087088
Test: m ndk # with barbet-next-userdebug in goog/main
Change-Id: I8f750645f79c3cf48a85879c36e1549df47eee97
2023-10-05 21:32:06 +00:00
Alina Kalyakina
2ea0f6db1f Merge "Revert "Filter REL out of PLATFORM_VERSION_ALL_CODENAMES."" into main am: 618d848f0d
Original change: https://android-review.googlesource.com/c/platform/build/+/2773151

Change-Id: Ibc6f5d1c22c4c86b48f5818235bd61b8974078d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 10:24:05 +00:00
Dan Shi
d637190deb Revert "Filter REL out of PLATFORM_VERSION_ALL_CODENAMES."
This reverts commit 5346f7db62.

Reason for revert: b/303552537 

Change-Id: I915be23c7d234d28642c141473bf2a180ec4c3c6
2023-10-05 06:07:52 +00:00
Treehugger Robot
175dd937e4 Merge "Filter REL out of PLATFORM_VERSION_ALL_CODENAMES." into main am: 624b0f4b2f
Original change: https://android-review.googlesource.com/c/platform/build/+/2773148

Change-Id: Ifbffd104bfb476c7eb8af3aa2eeefae8a103309b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 00:41:48 +00:00
Dan Albert
5346f7db62 Filter REL out of PLATFORM_VERSION_ALL_CODENAMES.
The codename of the current release is replaced by "REL" when the
build is configured as a release rather than a preview. For example,
PLATFORM_VERSION_CODENAME.UpsideDownCake will be "REL" rather than
UpsideDownCake in a -next target when the upcoming release is
UpsideDownCake. "REL" shouldn't really be treated as a codename
though. It's a placeholder to indicate that the build is a release and
so doesn't really have a codename. The list of all codenames ends up
in ro.build.version.all_codenames, and also ends up feeding the logic
for stub generation in soong, neither of which are places that should
include REL.

Bug: http://b/303087088
Test: m ndk # with barbet-next-userdebug in goog/main
Change-Id: I97972439e1f06c09f0ed59e7e2191c489a214e88
2023-10-04 23:11:39 +00:00
Treehugger Robot
a61ed55d48 Merge "Do not freeze VNDK in trunk stable" into main am: 1e042d4635
Original change: https://android-review.googlesource.com/c/platform/build/+/2747261

Change-Id: I9eec8eed73fe4f3e816765ef59cff2e612f2c679
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 00:43:18 +00:00
Justin Yun
e9525900e5 Do not freeze VNDK in trunk stable
VNDK will be frozen only if the VNDK version is less than or equal to
34. Otherwize do not freeze the VNDK libraries.

Bug: 297542516
Bug: 299867815
Test: lunch cf_x86_64_phone-next-userdebug; m
Change-Id: Icdd288f65c5f7bdb5b4899c8e96820c2a147a011
2023-09-13 13:07:34 +09:00
Xin Li
be1435290d Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: If9360ebd0acebe85f42f89a268c316d51c765708
Change-Id: I58470464a3239a2ad8e82e4821bb27a2892a8302
2023-08-25 13:25:26 -07:00
Joe Onorato
89f17ef427 Allow PLATFORM_VERSION_CODENAME to be overridden by RELEASE_PLATFORM_VERSION_CODENAME_REL
Bug: 282843732
Test: get_build_var PLATFORM_VERSION_CODENAME
Change-Id: I16b9cf4ec8f395ceb192e35c18850fdab0a47df3
2023-07-14 14:18:08 -07:00
Joe Onorato
ed951095cd Merge changes from topic "aosp_starlark_release_config" am: d5eb7a6d28 am: 4792be7660 am: 283db3fb83
Original change: https://android-review.googlesource.com/c/platform/build/+/2621452

Change-Id: I59742ac2ffa309d7cfd9a236546bba545124c89e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 04:31:00 +00:00
Joe Onorato
6d7afa00e3 Make RELEASE_PLATFORM_VERSION a release config flag to set platform version.
Bug: 282838389
Test: Treehugger
Merged-In: Ic6dacbdee7d2408aa8b25b4df59bf9bbc566d747
Change-Id: Ie61a7d986c2b8fe2c16117f6678b9e5a71711647
2023-06-11 09:17:43 -07:00
Jeongik Cha
43aaa8989e BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration am: d0b037235d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23378947

Change-Id: I0fef5b60fe9f2aeeff7d09b55901782f3fcd8df2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 02:07:17 +00:00
Jeongik Cha
d0b037235d BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration
* Extract BUILD_NUMBER, BUILD_HOSTNAME to file to avoid kati change
* Handle FILE_NAME_TAG_PLACEHOLDER string in dist in build/make/packaging/distdir.mk

Ignore-AOSP-First: there are internal use cases of FILE_NAME_TAG
Test: check if kati isn't invoked even though BUILD_NUMBER, BUILD_HOSTNAME
  is changed
Test: m && m, and check if the second m is no-op
Bug: 278060169
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7b40aa8338ba85a58ee481fe6bafac2959f7112b)
Merged-In: I1b37760242853c1a145bad255d0bb15524234b25
Change-Id: I1b37760242853c1a145bad255d0bb15524234b25
2023-05-22 22:42:07 +00:00
Jeongik Cha
05210f96b3 BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration
* Extract BUILD_NUMBER, BUILD_HOSTNAME to file to avoid kati change
* Handle FILE_NAME_TAG_PLACEHOLDER string in dist in build/make/packaging/distdir.mk

Test: check if kati isn't invoked even though BUILD_NUMBER, BUILD_HOSTNAME
  is changed
Test: m && m, and check if the second m is no-op
Bug: 278060169
Change-Id: I1b37760242853c1a145bad255d0bb15524234b25
Merged-In: I1b37760242853c1a145bad255d0bb15524234b25
2023-05-23 07:14:22 +09:00
Dan Albert
9b507330eb Merge changes from topic "fix-api_levels.json" am: 249bc4c034 am: bf5d61971e am: 39bca0748a
Original change: https://android-review.googlesource.com/c/platform/build/+/2509758

Change-Id: Icb775a6ab8cc08bc2e495c6cc86c87297e8986a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 17:43:09 +00:00
Dan Albert
4d24cbd044 Separate active codenames and preview codenames.
Using PLATFORM_VERSION_ALL_CODENAMES (which is a bad name for
historical reasons) for discovering preview API levels doesn't work in
the narrow window where the branch's development is not for the latest
release. Create a second variable for preview codenames and expose it
to soong.

Bug: None
Test: None
Change-Id: I8c271c1d646ea8285553614c6bca944227a0e643
2023-03-28 23:25:45 +00:00
Nick Kovacs
4c22e6060e Merge "Update minimum supported targetSdk to 29" 2022-08-11 19:26:33 +00:00
Nick Kovacs
2092c97c2e Update minimum supported targetSdk to 29
Trailing by 4 major releases, as per schedule.

Test: make

Bug: 215522897
Change-Id: I33cd75a1092cb54f3f56bab6083d8f9211a32b64
2022-08-08 18:47:31 +00:00
Nick Kovacs
67ebe09f86 Update minimum supported targetSdk to 28
This change will cause a dismissable warning message to display
indicating the app is targeting a low targetSdkVersion.

Previously this message was displayed for apps targeting < 23.

The eventual goal is to move this to 29, but still
working through some failed CTS tests. Updating first
to 28, and then will follow up with an update to 29.

Bringing this to 29 would be in line with trailing
by 4 major releases.

Test: make
Test: atest CtsWindowManagerSdk25TestCases:AspectRatioSdk25Tests
Test: atest CtsWindowManagerSdk28TestCases:AspectRatioSdk28Tests
Change-Id: I669d325770b5abebcb29c2f4dc31f82fb8e638c7
2022-08-05 19:32:08 +00:00
Nick Kovacs
9d2cf6f326 Revert "Update minimum supported targetSdk to 29"
Revert "Expect warning message for app targetSdk < 29"

Revert submission 19380683-increase-min-target-sdk-version

Reason for revert: Test failures
Reverted Changes:
Ie4a4ad6d4:Update minimum supported targetSdk to 29
Icda326d6e:Expect warning message for app targetSdk < 29

Change-Id: I46c71b21e97d702408ecca8c8c0172e5f92ceb0c
2022-08-03 22:37:47 +00:00
Nick Kovacs
2a8c1b9554 Update minimum supported targetSdk to 29
Trailing by 4 major releases, as per schedule.

Test: make
Test: atest CtsWindowManagerSdk25TestCases:AspectRatioSdk25Tests
Test: atest CtsWindowManagerSdk28TestCases:AspectRatioSdk28Tests

Bug: 215522897
Change-Id: Ie4a4ad6d4e7af8c23003a653a2d2ef514adb1169
2022-07-27 23:50:48 +00:00
Sebastian Ene
573fbcd114 Drop the PLATFORM_VERSION_CODENAME conditional
Evaluate the list of all active codenames when version_util.mk is
invoked.

Bug: 230720688
Change-Id: I1c6a3e94230e856cf41f1f79b37893576957dc3d
Signed-off-by: Sebastian Ene <sebastianene@google.com>
2022-04-29 09:09:03 +00:00
Colin Cross
a492544a03 Add PLATFORM_DISPLAY_VERSION
Add PLATFORM_DISPLAY_VERSION to version_defaults.mk that will propagate
to the ro.build.version.release_or_preview_display property and
be shown as the Android version for preview releases by Settings.

Bug: 221950960
Test: manual
Change-Id: I697cc59f77f92aa98a8a2573662797e6d3bd2042
2022-02-28 18:01:35 -08:00
satayev
2d94586cff Introduce ro.build.version.known_codenames sysprop.
It defines values for Build.VERSION.KNOWN_CODENAMES constant, and should
contain all codenames starting from Q, including current codename
for in development branches.

Bug: 211747008
Test: presubmit
Change-Id: If8995750e369ba39bfc7041580c21b2f96632a78
2022-02-11 13:20:49 +00:00
Joseph Jang
cc1f5e43aa Revert "Update minimum supported targetSdk to 28."
This reverts commit 7918526355.

Reason for revert: <Test break by b/216280809>

Change-Id: I4d11564314034d7596261c1760dd79d3d5b82f2e
2022-01-26 03:15:15 +00:00
Narayan Kamath
7918526355 Update minimum supported targetSdk to 28.
Trailing by 4 major releases, as per schedule.

Test: make
Bug: 215522897
Change-Id: I893fe0ee68cce4b08061628ed641b845d2d79b63
2022-01-24 14:59:20 +00:00
Sasha Smundak
1335903d4e Move the stable code from version_defaults.mk to version_util.mk.
With version_defaults.mk containing only simple assignments, it can be
automatically converted to Starlark.
This is a cherrypick of ag/15768054

Bug: 198995713
Test: treehugger
Merged-In: I4798fb69c639e6d52d275a5b793fa0c8ba876202
Change-Id: I17fab2e46c085fc4c07ae13c5e8cfb439097c634
2021-09-13 09:23:40 -07:00