aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2020-07-28Update OWNERS to reflect current situation. am: 6de1ded66a am: afba1ee7ec ↵Hidehiko Abe
am: 2d11cdd2de am: 1bc90b6342 Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1373140 Change-Id: Iec023d120f03478b83b9a9e8d9a7f366619ad4ec
2020-07-28Update OWNERS to reflect current situation. am: 6de1ded66a am: afba1ee7ec ↵Hidehiko Abe
am: 2d11cdd2de Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1373140 Change-Id: I2a905d36008e8ae164a08a173de22ff0b40d4dcd
2020-07-28Update OWNERS to reflect current situation. am: 6de1ded66a am: afba1ee7ecHidehiko Abe
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1373140 Change-Id: Ib659d064590da10c19a5fbb51812d8b24333d800
2020-07-28Update OWNERS to reflect current situation. am: 6de1ded66aHidehiko Abe
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1373140 Change-Id: Ia53539945ea812d1d0c82ee2416a7aa749a397c3
2020-07-28Update OWNERS to reflect current situation.Hidehiko Abe
Bug: None Test: None Change-Id: I35a39f056eba9ca0f5fab1927f3c5bd3b57791a5
2020-07-28libbrillo: Remove WatchFileDescriptor. am: 295ef84cb2 am: 4b4f0480d0 am: ↵Hidehiko Abe
48220c6930 am: d4bf0e9fd2 am: 9827c06439 Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1371782 Change-Id: I9f62be32b004fbfd8e79ede1227ae78c136b6764
2020-07-28libbrillo: Remove WatchFileDescriptor. am: 295ef84cb2 am: 4b4f0480d0 am: ↵Hidehiko Abe
48220c6930 am: d4bf0e9fd2 Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1371782 Change-Id: I51adb9195f8eb0ef29a452c5079bda6f686c7a24
2020-07-28libbrillo: Remove WatchFileDescriptor. am: 295ef84cb2 am: 4b4f0480d0 am: ↵Hidehiko Abe
48220c6930 Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1371782 Change-Id: I57b6119e1da1e080a24298cb4f24e21c6537d7bb
2020-07-28libbrillo: Remove WatchFileDescriptor. am: 295ef84cb2 am: 4b4f0480d0Hidehiko Abe
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1371782 Change-Id: I41292e1fb2d15eecc503690b02f8677c84a36da4
2020-07-28libbrillo: Remove WatchFileDescriptor. am: 295ef84cb2Hidehiko Abe
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1371782 Change-Id: I46f9f11acda98580b71feb54baf91809712fa775
2020-07-24libbrillo: Remove WatchFileDescriptor.Hidehiko Abe
Its base API MessageLoopForIO::WatchFileDescriptor is removed in the next libchrome uprev. All use cases are already migrated into new API base::FileDescriptorWatcher. This CL removes the support in libbrillo. BUG=chromium:909719 TEST=Build locally. Ran cros_run_unit_tests. Cq-Depend: chromium:1958264 Change-Id: I7627c05bff0d472078139ec522182c2d331851ee Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/1828788 Tested-by: Qijiang Fan <fqj@google.com> Commit-Queue: Qijiang Fan <fqj@google.com> Reviewed-by: Eric Caruso <ejcaruso@chromium.org> Cr-Mirrored-From: https://chromium.googlesource.com/chromiumos/platform2 Cr-Mirrored-Commit: 78ed4639e33141d0612225a6869511c12dcbb8bc (cherry picked from commit de74a5cc1a2e2ab9b9f4749d406b9afeee2db6ea)
2020-07-01Revert "libbrillo: break SecureAllocator dependence on std::vector<uint8_t>" ↵Qijiang Fan
am: 16430c43b2 am: 6d64bb179e am: ab4c5bf8a2 am: 6565bfd206 am: ccb63980ae Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1353564 Change-Id: Ia7e3c1e788c8e1262218c1e752ad67f8b435a668
2020-07-01libbrillo: remove base::ValueReferenceAdapter am: 690d8d51a6 am: 7a76d80e7f ↵hscham
am: 9620558042 am: 99900c6a41 am: e9dbd9968b Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1353563 Change-Id: I0ecc95e83567fee4ab9830d8468946d87ab15f4d
2020-07-01Merge commit 'cf6c031ec38f6932125148cdaceb984b07ec5052' into HEAD am: ↵Qijiang Fan
e2e0f82d2c am: d4ab54f375 am: bb9b65f388 am: b6436bf48e am: 2c55f9e64f Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1353562 Change-Id: Iedac525e10640d62cad6401ae3a1807cb0c8fc3d
2020-07-01Revert "libbrillo: break SecureAllocator dependence on std::vector<uint8_t>" ↵Qijiang Fan
am: 16430c43b2 am: 6d64bb179e am: ab4c5bf8a2 am: 6565bfd206 Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1353564 Change-Id: Ia4e1988ac461171b69bae5547450d7fbf3f47722
2020-07-01libbrillo: remove base::ValueReferenceAdapter am: 690d8d51a6 am: 7a76d80e7f ↵hscham
am: 9620558042 am: 99900c6a41 Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1353563 Change-Id: Ia2dd929e30be1dc6967c21f9e6753e5aac107c1c
2020-07-01Merge commit 'cf6c031ec38f6932125148cdaceb984b07ec5052' into HEAD am: ↵Qijiang Fan
e2e0f82d2c am: d4ab54f375 am: bb9b65f388 am: b6436bf48e Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1353562 Change-Id: I4b20e56b459fd7de8a98bebeb159445e02d61e9d
2020-07-01Revert "libbrillo: break SecureAllocator dependence on std::vector<uint8_t>" ↵Qijiang Fan
am: 16430c43b2 am: 6d64bb179e am: ab4c5bf8a2 Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1353564 Change-Id: I7b164487063570927deef99d9941cb4e049fcd91
2020-07-01libbrillo: remove base::ValueReferenceAdapter am: 690d8d51a6 am: 7a76d80e7f ↵hscham
am: 9620558042 Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1353563 Change-Id: I4f8ef09a35ffc8af6df0e491a2fd81dc732dab7d
2020-07-01Merge commit 'cf6c031ec38f6932125148cdaceb984b07ec5052' into HEAD am: ↵Qijiang Fan
e2e0f82d2c am: d4ab54f375 am: bb9b65f388 Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1353562 Change-Id: Id2486521997d90f1c72c22047b544b9038b0de80
2020-07-01Revert "libbrillo: break SecureAllocator dependence on std::vector<uint8_t>" ↵Qijiang Fan
am: 16430c43b2 am: 6d64bb179e Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1353564 Change-Id: I4de645b429492f2b3c7764ab34cb8e8c7b2010ba
2020-07-01libbrillo: remove base::ValueReferenceAdapter am: 690d8d51a6 am: 7a76d80e7fhscham
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1353563 Change-Id: I55c6fff44f42b1c0c3817293ac47e3d2305ac16c
2020-07-01Merge commit 'cf6c031ec38f6932125148cdaceb984b07ec5052' into HEAD am: ↵Qijiang Fan
e2e0f82d2c am: d4ab54f375 Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1353562 Change-Id: Ia9ac7d2a6eeb4161711d48a9de1a63191c0cd859
2020-07-01Revert "libbrillo: break SecureAllocator dependence on std::vector<uint8_t>" ↵Qijiang Fan
am: 16430c43b2 Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1353564 Change-Id: Id071ec07cf52b71d1de6a54b3e07dcb9a81ebe92
2020-07-01libbrillo: remove base::ValueReferenceAdapter am: 690d8d51a6hscham
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1353563 Change-Id: Iee10c396c0f825a664545fe72fb11517e9c42a08
2020-07-01Merge commit 'cf6c031ec38f6932125148cdaceb984b07ec5052' into HEAD am: e2e0f82d2cQijiang Fan
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1353562 Change-Id: I9fc110e7621f37f1cafb644b26d0a0f4c5fcbd4e
2020-06-30Revert "libbrillo: break SecureAllocator dependence on std::vector<uint8_t>"android-r-beta-3android-r-beta-2Qijiang Fan
This reverts commit 10f3dc438da6f8ade5c0eb90f9cf894e449fe997. Change-Id: I5231fe6bf31640da9b7dce9d5bf76ae2529ebd2f
2020-06-30libbrillo: remove base::ValueReferenceAdapterhscham
Was used for libchrome uprev migration. BUG=chromium:909719 TEST=unit tests Change-Id: Ic4558e170007a432c241ae9ae9093b222f191bca Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2050213 Tested-by: Grace Cham <hscham@chromium.org> Reviewed-by: Eric Caruso <ejcaruso@chromium.org> Commit-Queue: Grace Cham <hscham@chromium.org> Cr-Mirrored-From: https://chromium.googlesource.com/chromiumos/platform2 Cr-Mirrored-Commit: 401d60844eaf8b9b1f5ca2a72b599304dea178fe
2020-06-30Merge commit 'cf6c031ec38f6932125148cdaceb984b07ec5052' into HEADQijiang Fan
Change-Id: I90f2ab3a34cecf138d25efa754df4491dea4374a
2020-06-29Track new upstream. am: 80a50c2fb5 am: 8a8fc45fe2 am: e397af970a am: ↵Qijiang Fan
a5faadee11 am: 99d851cd19 Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1348948 Change-Id: I7565414109658e1f31ac2df51930b8028416efc6
2020-06-29Track new upstream. am: 80a50c2fb5 am: 8a8fc45fe2 am: e397af970a am: a5faadee11Qijiang Fan
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1348948 Change-Id: If8e957d53124db4a1a5e4c766faac3c613d14cac
2020-06-29Track new upstream. am: 80a50c2fb5 am: 8a8fc45fe2 am: e397af970aQijiang Fan
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1348948 Change-Id: I557c09ea2d28db33d2514449d8c7088c9ec44cef