aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-05-29Snap for 10220872 from 43eff38f31cc423b8e54abe539b1c824f8d951b6 to ↵android-14.0.0_r9android-14.0.0_r8android-14.0.0_r7android-14.0.0_r6android-14.0.0_r5android-14.0.0_r4android-14.0.0_r3android-14.0.0_r12android-14.0.0_r11android-14.0.0_r10android14-d1-s7-releaseandroid14-d1-s6-releaseandroid14-d1-s5-releaseandroid14-d1-s4-releaseandroid14-d1-s3-releaseandroid14-d1-s2-releaseandroid14-d1-s1-releaseandroid14-d1-releaseAndroid Build Coastguard Worker
udc-d1-release Change-Id: I5ab18b7b93ec92417b32f84e4089516ad9e3ba88
2023-05-29add isAtLeastV() am: 17b65afab8Maciej Żenczykowski
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/23436203 Change-Id: I041a46fae2ab7b168368cb7448c5c4b394a15442 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25add isAtLeastV()android14-devMaciej Żenczykowski
Basing this on the state from before: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2535803 but with U/UpsideDownCake replaced with V/VanillaIceCream I assume we don't yet know if V will be 35 or higher. Bug: 277813952 Test: TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> (cherry picked from https://android-review.googlesource.com/q/commit:600ca498ae054d2a6919378d59c8da471748edc1) Merged-In: Ie2fe7b0bc8b82f8049e51ac7f85b0d9722e9f5ed Change-Id: Ie2fe7b0bc8b82f8049e51ac7f85b0d9722e9f5ed
2023-04-15Snap for 9948600 from 709ec6fd1c37d13601744299681637bc1b37edea to udc-d1-releaseAndroid Build Coastguard Worker
Change-Id: I5015581bd2f41c0c8f86269e1262e7177397a282
2023-04-14Merge "UpsideDownCake/34 is now REL" into udc-dev am: 6417db54caTreehugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/22636978 Change-Id: I8d3025c2c5e23f0c384ec14d81660a48bdec7568 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14Merge "UpsideDownCake/34 is now REL" into udc-devTreehugger Robot
2023-04-14UpsideDownCake/34 is now RELAlex Buynytskyy
Ignore-AOSP-First: UpsideDownCake Finalization Bug: 275409981 Test: build Change-Id: I024b8f1f2622dbcafdf667095511dc3814297a46
2023-04-14Snap for 9940335 from 82307cdb033b8ba399ca5b88cad241ae46c61531 to udc-d1-releaseAndroid Build Coastguard Worker
Change-Id: I1cb0c90bd554cf6ec906a8bf28960b54345d023f
2023-04-13[automerger skipped] Update isAtLeastU to accept codename U builds am: ↵Anton Hansson
a3d3b5dc0d am: 679ee76aee am: 86e76dc540 -s ours am: 0147922c17 -s ours am skip reason: Merged-In I70f3909d952759eed7c1c76a9805691deb8edd29 with SHA-1 2845846f68 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2535640 Change-Id: I1734b7a01972b5291175e2cc48d9d9845e834fc5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13[automerger skipped] UpsideDownCake is now 34 am: 5d749e2485 am: 0d30cda965 ↵Anton Hansson
am: b7e76399a0 -s ours am: 0006899345 -s ours am skip reason: Merged-In I3515aafccdd32aa2b27d01885f8c55bfd245b3b5 with SHA-1 3ca7906b21 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2535803 Change-Id: I2ea433952a0e823ea6ef265aecf508844d6f41f2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13[automerger skipped] Update isAtLeastU to accept codename U builds am: ↵Anton Hansson
a3d3b5dc0d am: eb3cdc5e2a -s ours am: 3bcf3d50b1 -s ours am skip reason: Merged-In I70f3909d952759eed7c1c76a9805691deb8edd29 with SHA-1 2845846f68 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2535640 Change-Id: Idce6609bec2cac21dd9f7cf73d56af9e0570d7bd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13[automerger skipped] Update isAtLeastU to accept codename U builds am: ↵Anton Hansson
a3d3b5dc0d am: 679ee76aee am: 86e76dc540 -s ours am skip reason: Merged-In I70f3909d952759eed7c1c76a9805691deb8edd29 with SHA-1 2845846f68 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2535640 Change-Id: I5ed56ff5a1fa13c679944eaae3140929b8c97f0d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13[automerger skipped] UpsideDownCake is now 34 am: 5d749e2485 am: 0d30cda965 ↵Anton Hansson
am: b7e76399a0 -s ours am skip reason: Merged-In I3515aafccdd32aa2b27d01885f8c55bfd245b3b5 with SHA-1 3ca7906b21 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2535803 Change-Id: I03e72727b5e8f7186ee72f3e53c66b102230b13d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13[automerger skipped] UpsideDownCake is now 34 am: 5d749e2485 am: b6ddcdc1f4 ↵Anton Hansson
-s ours am: b5352cd9f6 -s ours am skip reason: Merged-In I3515aafccdd32aa2b27d01885f8c55bfd245b3b5 with SHA-1 3ca7906b21 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2535803 Change-Id: I35a010c2c8cd6878670524ac9f5ec8f8e69f1dc5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13Update isAtLeastU to accept codename U builds am: a3d3b5dc0d am: 679ee76aeeAnton Hansson
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2535640 Change-Id: Id01257ad28c745cf37bccb54f24449cebb7db3f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13UpsideDownCake is now 34 am: 5d749e2485 am: 0d30cda965Anton Hansson
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2535803 Change-Id: I57b456407be42e0fc5f4da93e64e439023c3215c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13[automerger skipped] Update isAtLeastU to accept codename U builds am: ↵Anton Hansson
a3d3b5dc0d am: eb3cdc5e2a -s ours am skip reason: Merged-In I70f3909d952759eed7c1c76a9805691deb8edd29 with SHA-1 2845846f68 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2535640 Change-Id: Id94cbe09bca8cea5f32e55b341c8b670d57cc0c6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13[automerger skipped] UpsideDownCake is now 34 am: 5d749e2485 am: b6ddcdc1f4 ↵Anton Hansson
-s ours am skip reason: Merged-In I3515aafccdd32aa2b27d01885f8c55bfd245b3b5 with SHA-1 3ca7906b21 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2535803 Change-Id: I8d82f2f9e94a058568b7ae4d48fa79e1a64e8d2c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13Update isAtLeastU to accept codename U builds am: a3d3b5dc0dAnton Hansson
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2535640 Change-Id: I505dece062f4e7bae601fe158912fba6c76785f2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13UpsideDownCake is now 34 am: 5d749e2485Anton Hansson
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2535803 Change-Id: I84410b36d229f070d67198299955c06e575f2ace Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13Update isAtLeastU to accept codename U builds am: a3d3b5dc0dAnton Hansson
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2535640 Change-Id: Ib76cb8b84054753b5582b7d0de0c2c9a8b07c0c1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13UpsideDownCake is now 34 am: 5d749e2485Anton Hansson
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2535803 Change-Id: Id223c898d214c3e00dbd59dc75dd94ced800803e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13Update isAtLeastU to accept codename U builds am: 2845846f68Anton Hansson
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/22609799 Change-Id: I0c699516d90950574bd2707b21cf98092de2e939 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13Update isAtLeastU to accept codename U buildsAnton Hansson
The minimizes the disruption caused by using pre-finalization system images (with codename=UpsideDownCake) with ToT modules (currently checking only for SDK_INT>=34). This is also inline with the androidx BuildCompat implementation. Bug: 277816175 Test: presubmit Merged-In: I70f3909d952759eed7c1c76a9805691deb8edd29 Change-Id: I70f3909d952759eed7c1c76a9805691deb8edd29
2023-04-13UpsideDownCake is now 34Anton Hansson
Ignore-AOSP-First: UpsideDownCake Finalization Bug: 275409981 Test: build (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3ca7906b21d7febd59d323d6eb58bfc9e7a5450f) Merged-In: I3515aafccdd32aa2b27d01885f8c55bfd245b3b5 Change-Id: I3515aafccdd32aa2b27d01885f8c55bfd245b3b5
2023-04-13Update isAtLeastU to accept codename U buildsAnton Hansson
The minimizes the disruption caused by using pre-finalization system images (with codename=UpsideDownCake) with ToT modules (currently checking only for SDK_INT>=34). This is also inline with the androidx BuildCompat implementation. Bug: 277816175 Test: presubmit Change-Id: I70f3909d952759eed7c1c76a9805691deb8edd29
2023-04-13[LSC] Add LOCAL_LICENSE_KINDS to frameworks/libs/modules-utils am: ↵Bob Badour
6ff141007c am: 892632a674 am: 363de28c32 am: 3119f51e32 Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2533699 Change-Id: I3c4f7cb436e6e598227836c4b4440def6cfd53c0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13[LSC] Add LOCAL_LICENSE_KINDS to frameworks/libs/modules-utils am: ↵Bob Badour
6ff141007c am: e37dc4e37f am: da1bf70356 Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2533699 Change-Id: Iddffe5cb098f4ca8e3060486d384bfb53371b42c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13[LSC] Add LOCAL_LICENSE_KINDS to frameworks/libs/modules-utils am: ↵Bob Badour
6ff141007c am: 892632a674 am: 363de28c32 Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2533699 Change-Id: I80f7d22d75aa354ad705de21cfb0de07a0cb4e74 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13[LSC] Add LOCAL_LICENSE_KINDS to frameworks/libs/modules-utils am: ↵Bob Badour
6ff141007c am: e37dc4e37f Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2533699 Change-Id: I7a3c516f915546ec2bd475eb15a4f6f5179c9de3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13[LSC] Add LOCAL_LICENSE_KINDS to frameworks/libs/modules-utils am: ↵Bob Badour
6ff141007c am: 892632a674 Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2533699 Change-Id: I09bdde197a31d400cfc69e2d97d830c94b9bd868 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13[LSC] Add LOCAL_LICENSE_KINDS to frameworks/libs/modules-utils am: 6ff141007cBob Badour
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2533699 Change-Id: Id7a18faeb2ce2825871841d23ef2d82a548d8a90 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13[LSC] Add LOCAL_LICENSE_KINDS to frameworks/libs/modules-utils am: 6ff141007cBob Badour
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2533699 Change-Id: Icd9f8f07bb396a29fe8211d74ba4ff3c305c468d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13Snap for 9931682 from 2b456f84a8a2591232c543050150c7c65cb2e5fb to udc-d1-releaseAndroid Build Coastguard Worker
Change-Id: Ibc607b27cacde0de6837c9af6cf083245373dc73
2023-04-12[LSC] Add LOCAL_LICENSE_KINDS to frameworks/libs/modules-utilsBob Badour
Added SPDX-license-identifier-Apache-2.0 to: jni/expresslog/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Change-Id: I84a0230e2180b7d63915837c7caca5efd3f00138
2023-04-12[automerger skipped] [TeX] Added telemetry express utility static lib am: ↵Vova Sharaienko
b9b201351d am: 86d9645b9b am: 4ee438486d -s ours am: 5e004eb5f1 -s ours am skip reason: Merged-In I914d6ac88e5b4445c51c09109a79ff828ada3e9b with SHA-1 9376c5e09c is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2500657 Change-Id: I7c59a112ff0a7c59b3f07e8fb631a127f2404c5d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12[automerger skipped] [TeX] Added telemetry express utility static lib am: ↵Vova Sharaienko
b9b201351d am: 86d9645b9b am: 4ee438486d -s ours am skip reason: Merged-In I914d6ac88e5b4445c51c09109a79ff828ada3e9b with SHA-1 9376c5e09c is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2500657 Change-Id: Ifac15dd0721b0e5c665c59278842d78033ec56b2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12[automerger skipped] [TeX] Added telemetry express utility static lib am: ↵Vova Sharaienko
b9b201351d am: 48d5ef4bd2 -s ours am: f82db1a9c6 -s ours am skip reason: Merged-In I914d6ac88e5b4445c51c09109a79ff828ada3e9b with SHA-1 9376c5e09c is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2500657 Change-Id: I175681c2023c7cb698261355ca5162927e2961cf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12[TeX] Added telemetry express utility static lib am: b9b201351d am: 86d9645b9bVova Sharaienko
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2500657 Change-Id: I7fc826db46ddcada0ce99d60f870ff17a1971c47 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12[automerger skipped] [TeX] Added telemetry express utility static lib am: ↵Vova Sharaienko
b9b201351d am: 48d5ef4bd2 -s ours am skip reason: Merged-In I914d6ac88e5b4445c51c09109a79ff828ada3e9b with SHA-1 9376c5e09c is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2500657 Change-Id: I1741f072d612aaaf87f1be52f12c7fdfd279cb3d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12[TeX] Added telemetry express utility static lib am: b9b201351dVova Sharaienko
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2500657 Change-Id: I867ea4a3d2c68fd0c9a482a1e3b069a2a56989c8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12[TeX] Added telemetry express utility static lib am: b9b201351dVova Sharaienko
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2500657 Change-Id: I90e610f245cf67454ab658623a63f24024a90741 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11Snap for 9918769 from 2a6bef1bc5531085df38b4d408834caaf59bbf80 to udc-d1-releaseAndroid Build Coastguard Worker
Change-Id: I861431ea3189ef378e8377780a0579b7e157b1e6
2023-04-11UpsideDownCake is now 34 am: 3ca7906b21Alex Buynytskyy
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/22461805 Change-Id: I9c0b45e7427a5a9964e6550c549949bb5a4f043f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07Snap for 9899688 from 2379cc7fa0c882d81328968190c42db397836eee to udc-d1-releaseAndroid Build Coastguard Worker
Change-Id: Ife70692765f736f014bd40f8237a35a433091aa2
2023-04-06UpsideDownCake is now 34Alex Buynytskyy
Ignore-AOSP-First: UpsideDownCake Finalization Bug: 275409981 Test: build Change-Id: I3515aafccdd32aa2b27d01885f8c55bfd245b3b5
2023-04-06[TeX] Added telemetry express utility static lib am: 9376c5e09cVova Sharaienko
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/22198215 Change-Id: I7d57b8467989aa45afffcd04a7c1e987ad4859bb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06[TeX] Added telemetry express utility static libandroid-u-beta-1-gplVova Sharaienko
- to be used by AdServices Bug: 271127104 Test: atest ExpressLogApisTests Change-Id: I914d6ac88e5b4445c51c09109a79ff828ada3e9b Merged-In: I914d6ac88e5b4445c51c09109a79ff828ada3e9b
2023-04-05[TeX] Added telemetry express utility static libVova Sharaienko
- to be used by AdServices Bug: 271127104 Test: atest ExpressLogApisTests Ignore-AOSP-First: has to be merged with TeX changes into framework Change-Id: I914d6ac88e5b4445c51c09109a79ff828ada3e9b
2023-04-05Snap for 9884336 from 8217333602c741580e1ec823a592c95f0b17f46c to udc-d1-releaseAndroid Build Coastguard Worker
Change-Id: I7f27e1d71bf16266812ba340d426d2676bd78e7d