aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-01-14update OWNERSandroid-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Mike Frysinger
This project is only used by UE now, so point OWNERS to that. Bug: None Test: None Change-Id: I27e84411af8023e62c1a2fcad3a66b75aef1b401
2022-01-13Add missing includeColin Cross
Add missing sys/types.h include to fix building against musl libc. Bug: 190084016 Test: m USE_HOST_HOST=true host-native Change-Id: Ic75cb8db8978c3478cce65ec8838228bd245950d
2021-04-26Use libgtest_prod_headers. am: 7363599940 am: bbaab59d11 am: df5fcad0cdandroid-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-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-devandroid12-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-s-v2-preview-1Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1683961 Change-Id: Ie818b73280a6cb61338c51fae7e9d394aea718db
2021-04-26Use libgtest_prod_headers. am: 7363599940 am: bbaab59d11Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1683961 Change-Id: Idf6f4c14d3e430c282158c9bc5340b43f4001cc5
2021-04-26Use libgtest_prod_headers. am: 7363599940android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1683961 Change-Id: I48a63633751a11b61806503662fc3d4145601869
2021-04-22Use libgtest_prod_headers.android-s-beta-2android-s-beta-1Elliott Hughes
Bug: http://b/185916167 Test: treehugger Change-Id: I9c1e0645d291b5111bd8b04f100e6ad5e8c3bcfc
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: ead19d6ec6 -s ↵Xin Li
ours am: a004b8be7e -s ours am skip reason: Change-Id Iddb240a58054631a46732df42c32b693d73f0727 with SHA-1 2ad4083f8a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iae42204d25be012f969719ed1b668f3069aa14a5
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: ead19d6ec6 -s oursXin Li
am skip reason: Change-Id Iddb240a58054631a46732df42c32b693d73f0727 with SHA-1 2ad4083f8a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If4945abb0df8108dedf3db28e13148c794f5a5c6
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: Iddb240a58054631a46732df42c32b693d73f0727 Change-Id: I8ff9288119b7ab3ac276cbab9fcb17e02929cde3
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libbrillo am: a40b7ac895 am: ↵Bob Badour
436b555839 am: 74db6fcf21 Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1589001 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie9b7eb1c07a15888345e92c6dcb72f88566aa28e
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libbrillo am: a40b7ac895 am: ↵Bob Badour
436b555839 Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1589001 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib54d138915c154d8e070d6eaf7c4f10dd651ecf3
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libbrillo am: a40b7ac895Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1589001 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I065c9658b1e782bc07af8ec63f3956cceba52968
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/libbrilloandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ib9f0626167e657ffbb257116da65f7d145cc0e41
2020-11-24Mark ab/6881855 as merged am: ce54b28e3f am: 2ad4083f8aXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbrillo/+/13112819 Change-Id: I25432d95a13b7e511c379919a339922987c71cde
2020-11-24Mark ab/6881855 as merged am: ce54b28e3fXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbrillo/+/13112819 Change-Id: Iddb240a58054631a46732df42c32b693d73f0727
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I90959a183460f9e982f673c537f285dfe14672d7
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 570ae6f20e -s ours am: ↵Xin Li
aa1072b0bf -s ours am: 14309357ac -s ours am skip reason: Change-Id I6cf9a3a957c1ba217492bac953803f46af3dc911 with SHA-1 68f5677b92 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbrillo/+/12797052 Change-Id: I4dd29e3915fab5a2f9f0ed08c17a5dc9e435acc1
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 570ae6f20e -s ours am: ↵Xin Li
aa1072b0bf -s ours am skip reason: Change-Id I6cf9a3a957c1ba217492bac953803f46af3dc911 with SHA-1 68f5677b92 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbrillo/+/12797052 Change-Id: I8a8f45066f59594768a403440af3b95041c097f2
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 570ae6f20e -s oursXin Li
am skip reason: Change-Id I6cf9a3a957c1ba217492bac953803f46af3dc911 with SHA-1 68f5677b92 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbrillo/+/12797052 Change-Id: Ibf92215f231e57b36aba683121f07346d3503642
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I6cf9a3a957c1ba217492bac953803f46af3dc911 Change-Id: Id04e33537242441d80b9ec205960e65449af19ea
2020-09-14Using DoAll am: 49aee802dc am: 52c788785b am: f6fc2d2dfa am: a0cff5b8fe am: ↵Haibo Huang
877e27e50b Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1424778 Change-Id: I309981bff78f7ff3d6c4d5179805cd9e492e0179
2020-09-14Using DoAll am: 49aee802dc am: 52c788785b am: f6fc2d2dfa am: a0cff5b8feHaibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1424778 Change-Id: Icc7b4124f823ea9637e23b916d8a85eff319eee8
2020-09-14Using DoAll am: 49aee802dc am: 52c788785b am: f6fc2d2dfaHaibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1424778 Change-Id: Ic41dce60378e18e58928facdc88f937b7dc1f733
2020-09-14Using DoAll am: 49aee802dc am: 52c788785bHaibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1424778 Change-Id: I64fae1cbfe9efe55cf4863984b8d0e217d5ceff0
2020-09-14Using DoAll am: 49aee802dcHaibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1424778 Change-Id: I4b533a5086ff5b338c9a085fc188291c528cded4
2020-09-11Using DoAllHaibo Huang
The new googletest correctly put DoAll in testing namespace. Change-Id: I21a9a878c1cbe16aed1ef4b39d741d64e0041af6
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: ab13058e48 -s ours am: f815b33913 -s ours am: 7518289b75 -s ours am: dd6ab4fc69 -s ours am skip reason: Change-Id I4de645b429492f2b3c7764ab34cb8e8c7b2010ba with SHA-1 ab4c5bf8a2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbrillo/+/12469912 Change-Id: Ia7ecd6101b6d533a4fcc4098e2915b5c7eb642cc
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: ab13058e48 -s ours am: f815b33913 -s ours am: 7518289b75 -s ours am skip reason: Change-Id I4de645b429492f2b3c7764ab34cb8e8c7b2010ba with SHA-1 ab4c5bf8a2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbrillo/+/12469912 Change-Id: I038f07271240cfd92dc29b196cfc4c841dd7e3cc
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: ab13058e48 -s ours am: f815b33913 -s ours am skip reason: Change-Id I4de645b429492f2b3c7764ab34cb8e8c7b2010ba with SHA-1 ab4c5bf8a2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbrillo/+/12469912 Change-Id: I15e7629b357959b34a827738ff4263fd0ebdaa60
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: ab13058e48 -s ours am skip reason: Change-Id I4de645b429492f2b3c7764ab34cb8e8c7b2010ba with SHA-1 ab4c5bf8a2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbrillo/+/12469912 Change-Id: Idb70d2defece78f51d356689b5b1cd1e74182b86
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: I4de645b429492f2b3c7764ab34cb8e8c7b2010ba Change-Id: I45ebb65f7cf5ef7ccf78f9b3d6e9639129ef8112
2020-07-31libbrillo: replace sigorset with sigismember and sigaddset am: a4cec6c21e ↵Qijiang Fan
am: 2e12f6c0b5 am: b788106e21 am: 68f5677b92 am: 41299bebff Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1371781 Change-Id: I28815a33ec17d2009cd534e2f6d9bf9f9dc3729c
2020-07-31Revert "libbrillo: rename base::JSONReader methods" am: 830b8b038f am: ↵Qijiang Fan
34cc0826b2 am: be53cf4ab2 am: 8f0efce598 am: 6e1303826c Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1371780 Change-Id: Ie20b46f93c98543aae787bb4ccfb8680d3d07177
2020-07-31Merge commit '7a65c6bc48c96fa640cbf13d45a692d0a64200e3' into HEAD am: ↵Qijiang Fan
e07960d51b am: 35d33c2abd am: 876093a455 am: 19de62cd2a am: d1500dc291 Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1371779 Change-Id: I83d29663969a8c972b35c2ecebac5fee824e9764
2020-07-31libbrillo: replace sigorset with sigismember and sigaddset am: a4cec6c21e ↵Qijiang Fan
am: 2e12f6c0b5 am: b788106e21 am: 68f5677b92 Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1371781 Change-Id: Ib798d8341cd3656a58652b60baca4ae3b16bf77b
2020-07-31Revert "libbrillo: rename base::JSONReader methods" am: 830b8b038f am: ↵Qijiang Fan
34cc0826b2 am: be53cf4ab2 am: 8f0efce598 Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1371780 Change-Id: Iacbf8155b5d918a048c40e2b8e88ac03725e4301
2020-07-31Merge commit '7a65c6bc48c96fa640cbf13d45a692d0a64200e3' into HEAD am: ↵Qijiang Fan
e07960d51b am: 35d33c2abd am: 876093a455 am: 19de62cd2a Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1371779 Change-Id: Id1ebed94ab42f55a3a57f9093d4bd39013768c3b
2020-07-31libbrillo: replace sigorset with sigismember and sigaddset am: a4cec6c21e ↵Qijiang Fan
am: 2e12f6c0b5 am: b788106e21 Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1371781 Change-Id: I6cf9a3a957c1ba217492bac953803f46af3dc911
2020-07-31Revert "libbrillo: rename base::JSONReader methods" am: 830b8b038f am: ↵Qijiang Fan
34cc0826b2 am: be53cf4ab2 Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1371780 Change-Id: Ia74d2b40fb3c5e94f1387b682026276a73dbabf2
2020-07-31Merge commit '7a65c6bc48c96fa640cbf13d45a692d0a64200e3' into HEAD am: ↵Qijiang Fan
e07960d51b am: 35d33c2abd am: 876093a455 Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1371779 Change-Id: I36e9b91fbbd9affb0835c11b695404ce90ee9828
2020-07-31libbrillo: replace sigorset with sigismember and sigaddset am: a4cec6c21e ↵Qijiang Fan
am: 2e12f6c0b5 Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1371781 Change-Id: I071d1a6ee81aac2cb41f83474721827d62d9edce
2020-07-31Revert "libbrillo: rename base::JSONReader methods" am: 830b8b038f am: ↵Qijiang Fan
34cc0826b2 Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1371780 Change-Id: I802d6ea6764ff990209f5f652ee1b36221918340
2020-07-31Merge commit '7a65c6bc48c96fa640cbf13d45a692d0a64200e3' into HEAD am: ↵Qijiang Fan
e07960d51b am: 35d33c2abd Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1371779 Change-Id: I896235e3a47a1cc17df6ca567e419809018ae7ea
2020-07-31libbrillo: replace sigorset with sigismember and sigaddset am: a4cec6c21eQijiang Fan
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1371781 Change-Id: I57deb9f44cf3f3703566669fbd9e99c2a0d4ede0
2020-07-31Revert "libbrillo: rename base::JSONReader methods" am: 830b8b038fQijiang Fan
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1371780 Change-Id: I6a625a8d35f0522756099781eacc72e374ef57e8
2020-07-31Merge commit '7a65c6bc48c96fa640cbf13d45a692d0a64200e3' into HEAD am: e07960d51bQijiang Fan
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1371779 Change-Id: I6c5edc0de99e3374f3ab21a97180f38f194afdd1
2020-07-31libbrillo: replace sigorset with sigismember and sigaddsetQijiang Fan
Bug: None Test: mma Change-Id: Ibe5d3c0a040b21a8aa13ad258b9003d06b929b44
2020-07-31Revert "libbrillo: rename base::JSONReader methods"Qijiang Fan
This reverts commit 32948686256ac3df0e314b30749e32d94cff79a6. Reason for revert: JSONReaderDeprecated is not introduced in AOSP libchrome yet. Change-Id: I9c224dc8a3ce59c996e0da802723937d19c39118
2020-07-28Merge commit '7a65c6bc48c96fa640cbf13d45a692d0a64200e3' into HEADQijiang Fan
Change-Id: If41aa1299ee779171c376f3f4619538d7f380384
2020-07-28Update OWNERS to reflect current situation. am: 6de1ded66a am: afba1ee7ec ↵Hidehiko Abe
am: 2d11cdd2de am: 1bc90b6342 am: 3f77e5de33 Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1373140 Change-Id: I5099b1b3c27aa44ed69348dde11507c0444fbd30