summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-03-31Add missing <cassert> include am: e48304c210 am: 38e5df08ad am: b410ac450c ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseRyan Prichard
am: ffcab073fb Original change: https://android-review.googlesource.com/c/platform/external/dynamic_depth/+/1656851 Change-Id: I802a9595bfd4954b67c073cfc2452ab6d0c42b7e
2021-03-31Add missing <cassert> include am: e48304c210 am: 38e5df08ad am: b410ac450candroid-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Ryan Prichard
Original change: https://android-review.googlesource.com/c/platform/external/dynamic_depth/+/1656851 Change-Id: Ie5a8a85a9f6097d4bf27175fa58aca0aa69bd57b
2021-03-30Add missing <cassert> include am: e48304c210 am: 38e5df08adRyan Prichard
Original change: https://android-review.googlesource.com/c/platform/external/dynamic_depth/+/1656851 Change-Id: I78b2df2d1448171bd047679d822f05a0219d5100
2021-03-30Add missing <cassert> include am: e48304c210android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Ryan Prichard
Original change: https://android-review.googlesource.com/c/platform/external/dynamic_depth/+/1656851 Change-Id: I35a604baf75332b5753c15433d51bda654f7adb2
2021-03-29Add missing <cassert> includeandroid-s-beta-2android-s-beta-1Ryan Prichard
Previous versions of libc++ incidentally included <cassert> (assert.h) via the <memory> header, but this was fixed: https://reviews.llvm.org/rGa0686015106c2a04e85af82a4687895e12a4531c Bug: none Test: treehugger Change-Id: I63bbdcdd45c93b94334cb798aa79933eddea01dc
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 20522ba3ac -s ↵Xin Li
ours am: 875556760e -s ours am: 339c73d618 -s ours am skip reason: Change-Id Ia3ae9ad664d1cc012f356929eb3f3064dd710d96 with SHA-1 2a8b7d749f is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I63a7073949c2bc638ff78fd9c7acc86d6ada62f9
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 20522ba3ac -s ↵Xin Li
ours am: 875556760e -s ours am skip reason: Change-Id Ia3ae9ad664d1cc012f356929eb3f3064dd710d96 with SHA-1 2a8b7d749f is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic620dd5ffc3a1b7e8c8a4d5fd080d0bd3c93294a
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 20522ba3ac -s oursXin Li
am skip reason: Change-Id Ia3ae9ad664d1cc012f356929eb3f3064dd710d96 with SHA-1 2a8b7d749f is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie2a6a2a7e2c8937cb3411723f4628e106e1f7ccb
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: Ia3ae9ad664d1cc012f356929eb3f3064dd710d96 Change-Id: I098b9c19e45babe510e01e49e6c3fd3e99c682fb
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/dynamic_depth am: 24ec99c264 am: ↵Bob Badour
0cebe69c24 am: 38e4ea61e6 am: 844a36412e Original change: https://android-review.googlesource.com/c/platform/external/dynamic_depth/+/1588853 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7437c33d485c49b1ac5d37b2ebdf0dee1fca52fd
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/dynamic_depth am: 24ec99c264 am: ↵Bob Badour
0cebe69c24 am: 38e4ea61e6 Original change: https://android-review.googlesource.com/c/platform/external/dynamic_depth/+/1588853 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8aa1f3b0ff92dc85feb9cd5ba15dd8fd9c3c7fcf
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/dynamic_depth am: 24ec99c264 am: ↵Bob Badour
0cebe69c24 Original change: https://android-review.googlesource.com/c/platform/external/dynamic_depth/+/1588853 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0787b0160fa16470e4ee14162106d8a46c6cb2dc
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/dynamic_depth am: 24ec99c264Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/dynamic_depth/+/1588853 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib5ebde998e431b70c92a417db1222377b8be5640
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/dynamic_depthandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I0dd00738cf55ceeaa88acf62e9fcc4f9fa921b43
2020-11-24Remove 'vendor_available: false' am: c29005739c am: d45b5fbff1 am: 2a8b7d749fJustin Yun
Original change: https://android-review.googlesource.com/c/platform/external/dynamic_depth/+/1505762 Change-Id: I4ef1959e9aaeca4760434e4babbba07c35af2b1b
2020-11-24Remove 'vendor_available: false' am: c29005739c am: d45b5fbff1Justin Yun
Original change: https://android-review.googlesource.com/c/platform/external/dynamic_depth/+/1505762 Change-Id: Ia3ae9ad664d1cc012f356929eb3f3064dd710d96
2020-11-24Remove 'vendor_available: false' am: c29005739cJustin Yun
Original change: https://android-review.googlesource.com/c/platform/external/dynamic_depth/+/1505762 Change-Id: I98e28630cd84cc4356071c0887994e7b775e7d89
2020-11-23Remove 'vendor_available: false'Justin Yun
'vendor_available: false' is used for VNDK-private libraries that creates the vendor variants without allowing direct dependency from the modules in vendor partition. If the modules are not allowed to be used from any vendor modules, we must not define this property. Test: build Change-Id: I723c1fc62382793f2e16d33d7167010644adca8e
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: fca207ba92 -s ours am: 3755a0a840 am: f89ed11329 am: 2d1bef429f -s ours am skip reason: subject contains skip directive Change-Id: Id5cd2413f56334524d692e8bfffd6c2406de0912
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: fca207ba92 -s ours am: 3755a0a840 am: f89ed11329 Change-Id: Ieb0012723a1325a602a15556aad7de1cc81b6fc8
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: fca207ba92 -s ours am: 3755a0a840 Change-Id: I094fd28fdca583287427faf91bdb13a352f9e443
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: fca207ba92 -s ours am skip reason: subject contains skip directive Change-Id: I915d826f7fe1da8903cc4a5493bee604bddd0fae
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterandroid-r-beta-3android-r-beta-2Xin Li
Bug: 151763422 Change-Id: I62c3631aa659d96830922f1ac148322cc433dc1d
2020-03-31Remove redundant NOTICE symbolic link. am: 79d04ecc9a am: 42ebde4415 am: ↵Bob Badour
9c8ffc2512 am: 9cec338aee am: 3842dacc61 Change-Id: I89d49c95f0771760ee25f1c6e45cd22b5dc508db
2020-03-31Remove redundant NOTICE symbolic link. am: 79d04ecc9a am: 42ebde4415 am: ↵Bob Badour
9c8ffc2512 am: 9cec338aee Change-Id: Iaa7908000632b18a1ca3e94097bce16d65269176
2020-03-31Remove redundant NOTICE symbolic link. am: 79d04ecc9a am: 42ebde4415 am: ↵Bob Badour
9c8ffc2512 Change-Id: I2188043fa84dbb295d6f3513bae95b769a8f42e9
2020-03-31Remove redundant NOTICE symbolic link. am: 79d04ecc9a am: 42ebde4415Bob Badour
Change-Id: Id6b27142ab391038bf7154a42149b38da18db21d
2020-03-31Remove redundant NOTICE symbolic link. am: 79d04ecc9a am: 42ebde4415Bob Badour
Change-Id: I0f5bfef2eada9daa9599e378f0a90e206d2d5811
2020-03-30Remove redundant NOTICE symbolic link. am: 79d04ecc9aBob Badour
Change-Id: I0287364ac6761db6891f836d91122d25cf305394
2020-03-25Remove redundant NOTICE symbolic link.Bob Badour
Now that http://aosp/1235427 and http://aosp/1238719 are in, NOTICE symbolic links are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: Ia9af14a88f10d3119a5f671a9b4a9a15b78e3906
2019-10-30[automerger skipped] DO NOT MERGE - ↵r_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseXin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: c4e17d8ad1 am: eeaf88354f -s ours am skip reason: subject contains skip directive Change-Id: If3027a421f9b58bb0689d043222ee16fb2817af0
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2Xin Li
stage-aosp-master am: c4e17d8ad1 Change-Id: I7d00beaf11d21c53ea4891e8868d609748fca507
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I48640713aa19f01f5b26e9bf3f27bd8bb1a0fec8
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP master am: 53d4c6dbc5 -s ↵Xin Li
ours am: 96e07a57d9 -s ours am: 0c37961c4e -s ours am: 4e4f227db5 -s ours am skip reason: change_id I26e13dd88b006577b73f2528aaa5940492f45f7c with SHA1 de05c1aee5 is in history Change-Id: I88e694085a83194aa9eb68d3303f9398878e5109
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP master am: 53d4c6dbc5 -s ↵Xin Li
ours am: 96e07a57d9 -s ours am: 0c37961c4e -s ours am skip reason: change_id I26e13dd88b006577b73f2528aaa5940492f45f7c with SHA1 de05c1aee5 is in history Change-Id: Ia48fea6b5b6faac0476a2529f68db119d47627fe
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP master am: 53d4c6dbc5 -s oursXin Li
am: 96e07a57d9 -s ours am skip reason: change_id I26e13dd88b006577b73f2528aaa5940492f45f7c with SHA1 de05c1aee5 is in history Change-Id: Ie03dc4266fe543293b23dea163a8498e940f1e37
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP masterXin Li
am: 53d4c6dbc5 -s ours am skip reason: change_id I26e13dd88b006577b73f2528aaa5940492f45f7c with SHA1 de05c1aee5 is in history Change-Id: I7ee5ba537e716fb4edbf24691c5e194877a8fed7
2019-10-25Merge Coral/Flame into AOSP masterXin Li
Bug: 141248619 Change-Id: I9eb4a24c05895e2d7453ec5ca4fad8329c11ca9a Merged-In: I26e13dd88b006577b73f2528aaa5940492f45f7c
2019-10-16Skip QD1A.190821.011 in stage-aosp-master am: de05c1aee5 am: 635b838f34Xin Li
am: 369e00fdff Change-Id: I6958c6877d442230d092efe8b2324bdf0b16ef7a
2019-10-16Skip QD1A.190821.011 in stage-aosp-master am: de05c1aee5Xin Li
am: 635b838f34 Change-Id: Ib289964007c043a46f5d67fbb85145d205ccbd5d
2019-10-16Skip QD1A.190821.011 in stage-aosp-masterXin Li
am: de05c1aee5 Change-Id: Ibfb032a72293806bcac7be7548cc5f42eade396f
2019-10-16Skip QD1A.190821.011 in stage-aosp-masterb_141248619Xin Li
Bug: 141248619 Change-Id: I26e13dd88b006577b73f2528aaa5940492f45f7c
2019-09-11[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 3d6bb4841a -s ours am: 2e2f1b97ef -s ours am: 05cffea736 -s ours am skip reason: change_id If650b6aec14985233054bd9017b1e84608b574d5 with SHA1 d7e0bad295 is in history Change-Id: I1cdf19fe31189e15a37ba5574ea63cbe9f61bd0c
2019-09-11[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 3d6bb4841a -s ours am: 2e2f1b97ef -s ours am skip reason: change_id If650b6aec14985233054bd9017b1e84608b574d5 with SHA1 d7e0bad295 is in history Change-Id: Ic37430deca493815180f67b359f021bbeeba317f
2019-09-11[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 3d6bb4841a -s ours am skip reason: change_id If650b6aec14985233054bd9017b1e84608b574d5 with SHA1 d7e0bad295 is in history Change-Id: Ic1dfe940d17436e2bdfdf77ee0f361477ff50fa6
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
Bug: 135460123 Change-Id: I0ae4a57b30f4832c2f3a29e04cc048819674d1c6 Merged-In: If650b6aec14985233054bd9017b1e84608b574d5
2019-07-31Snap for 5768201 from 8facf7af35ae12fb6b5eb159eccbbf3b2ca49c3c to ↵android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid-build-team Robot
qt-c2f2-release Change-Id: I3d573c967f9e16913bfa8b2ecf8f7f85dc1a09f4
2019-07-30Check Android container item MIME type am: 8facf7af35 am: c18bb93182Emilian Peev
am: 6984c0e298 Change-Id: Id52645783367b8b1c73787343bfbc62ad53877ee
2019-07-30Check Android container item MIME type am: 8facf7af35 am: cfc5a976afEmilian Peev
am: fa436baa99 Change-Id: Id34aa26b6383b5fa833700302de964681b119b5e
2019-07-30Check Android container item MIME type am: 8facf7af35Emilian Peev
am: c18bb93182 Change-Id: Ieede574f47e350292dc3ce0a20a1f6d8f80efdc3
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 23:57:32 +0000