aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-08-12Stop hard coding gtest/gmock things. am: 581f4d4b27 am: d4eabd105dHEADandroid-wear-o-preview-4android-wear-o-preview-3android-o-preview-4android-o-preview-3android-o-preview-2android-o-preview-1android-o-mr1-iot-preview-6android-o-iot-preview-5android-n-mr2-preview-2android-n-mr2-preview-1android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7android-n-iot-release-ihome-igv1android-n-iot-preview-4sdk-releaseo-previewo-mr1-iot-preview-6o-iot-preview-5nougat-iot-releasen-iot-preview-4mastermainDan Albert
am: d5419299da Change-Id: I63492bab84e565236ce54e61b8e3957877974b31
2016-08-12Stop hard coding gtest/gmock things. am: 581f4d4b27Dan Albert
am: d4eabd105d Change-Id: Ic236c62ed98e857cfa666bdf159049f7b48f7379
2016-08-12Stop hard coding gtest/gmock things.android-n-mr1-preview-2android-n-mr1-preview-1Dan Albert
am: 581f4d4b27 Change-Id: I17cac0d3b95750273f18fd8f361f62697f60741c
2016-08-11Stop hard coding gtest/gmock things.Dan Albert
The headers are exported, and the build system automatically adds libgtest for test modules. Test: mma Bug: None Change-Id: Ib72c8ae28a62a16f8bc1a0731726d98dc91c0a13
2016-07-22Merge remote-tracking branch \\\\'weave/master\\\\' into ↵Luis Hector Chavez
\\\\'weave/aosp-master\\\\' am: 7aaba04460 am: 50cf4188d8 am: 9454fc7df0 am: 6125590925 Change-Id: I5381d0e6c3ff6b735068072c2cbf205d90f74893
2016-07-22Merge remote-tracking branch \\\'weave/master\\\' into ↵Luis Hector Chavez
\\\'weave/aosp-master\\\' am: 7aaba04460 am: 50cf4188d8 am: 9454fc7df0 Change-Id: I575199c9f7691f8b793d1816d3ec1b597747a501
2016-07-22Merge remote-tracking branch \\'weave/master\\' into \\'weave/aosp-master\\' ↵Luis Hector Chavez
am: 7aaba04460 am: 50cf4188d8 Change-Id: Ic04c6f2324e8cca80a089d40e504d3227a85e03b
2016-07-22Merge remote-tracking branch \'weave/master\' into \'weave/aosp-master\'Luis Hector Chavez
am: 7aaba04460 Change-Id: Iaad8807a03d2535d6fe61511d680dc0b5913c4da
2016-07-22Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'upstream-masterLuis Hector Chavez
17f710e libweave: Update libchrome APIs to r405848
2016-07-22libweave: Update libchrome APIs to r405848Luis Hector Chavez
The new libchrome has been ported from Chromium and some APIs have changed. Make necessary changes at call sites. Notable changes are: - base::Bind() now explicitly disallows captures in lambdas (which was never allowed in the style guide). - base::ListValue::iterator now exposes std::unique_ptr<base::Value> instead of raw base::Value*. BUG=29104761 TEST=All tests in libweave_test pass on dragonboard-eng build TEST=make testall Change-Id: Ifb2d4f83f9f92b8ded5f12ac1c622e8ab5549b7d Reviewed-on: https://weave-review.googlesource.com/4185 Reviewed-by: Robert Ginda <rginda@google.com>
2016-06-01Reland "Merge remote-tracking branch \'weave/master\' into ↵Luis Hector Chavez
\'weave/aosp-master\'" am: 83db8f75af am: b20409af35 am: da4667b75a am: 340025151a * commit '340025151a619931897234503cbebb267d2f8a7a': Reland "Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'" Change-Id: I1b6dae0960be5e66da81dab806d5c6a3033f8327
2016-06-01Reland "Merge remote-tracking branch \'weave/master\' into ↵Luis Hector Chavez
\'weave/aosp-master\'" am: 83db8f75af am: b20409af35 am: da4667b75a * commit 'da4667b75ad79aa4530b3db12259be303a2cd9a1': Reland "Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'" Change-Id: Ib4befd38226ffb190dad7b78d8a17f75c958ae87
2016-06-01Reland "Merge remote-tracking branch \'weave/master\' into ↵Luis Hector Chavez
\'weave/aosp-master\'" am: 83db8f75af am: b20409af35 * commit 'b20409af35ba1a15cd260567decb8ce9dca1d091': Reland "Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'" Change-Id: Iedc17137a9f07c6f9bbf2c6dc72b2cf211176c3f
2016-06-01Reland "Merge remote-tracking branch \'weave/master\' into ↵android-wear-n-preview-2android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2Luis Hector Chavez
\'weave/aosp-master\'" am: 83db8f75af * commit '83db8f75afbb37010450a6a5607764dedf20db6b': Reland "Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'" Change-Id: Idac2caa8eb2921e7ee9954a3896f936b793c99a7
2016-06-01Reland "Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'"Luis Hector Chavez
This reverts commit abfe7a063bbaebdca8703d27137c8c9aed826dac. All necessary changes are ready in AOSP for this to land. Change-Id: I9ac99ebbb292e047e6d6a7978e5748987d7f0f9d Reviewed-on: https://weave-review.googlesource.com/3720 Reviewed-by: Alex Vakulenko <avakulenko@google.com>
2016-05-31Revert "Merge remote-tracking branch \'weave/master\' into ↵Luis Hector Chavez
\'weave/aosp-master\'" am: abfe7a063b am: d77dfa0b5a am: 24b97cc306 am: 50a175dc8c * commit '50a175dc8c72fd300b59510dfe308e0ebb2d26ad': Revert "Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'" Change-Id: I238de2db5519cd1b7067f3eba46c4c7c62218671
2016-05-31Revert "Merge remote-tracking branch \'weave/master\' into ↵Luis Hector Chavez
\'weave/aosp-master\'" am: abfe7a063b am: d77dfa0b5a am: 24b97cc306 * commit '24b97cc306d4834f865f9599b379e73e1b326ab8': Revert "Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'" Change-Id: I9aad4853ea9f419c4234a0b7028608ef87aec82e
2016-05-31Revert "Merge remote-tracking branch \'weave/master\' into ↵Luis Hector Chavez
\'weave/aosp-master\'" am: abfe7a063b am: d77dfa0b5a * commit 'd77dfa0b5a854a80a586b89f13f602ee5a523d06': Revert "Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'" Change-Id: I0045e9f0eca8cb5701451c028b486e90477fe059
2016-05-31Revert "Merge remote-tracking branch \'weave/master\' into ↵Luis Hector Chavez
\'weave/aosp-master\'" am: abfe7a063b * commit 'abfe7a063bbaebdca8703d27137c8c9aed826dac': Revert "Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'" Change-Id: Id85d181a0a73598c6c4a3f397bd8085dd2c398e5
2016-05-31Revert "Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'"Luis Hector Chavez
This reverts commit 43625e411feabd7df36a8768ba8c4eca58a22e4d. This needs to happen in a staged fashion to avoid build breakages :/ Change-Id: Ie5474629bd301d7af27ee6167988b0381ac73271 Reviewed-on: https://weave-review.googlesource.com/3700 Reviewed-by: Luis Hector Chavez <lhchavez@google.com>
2016-05-31Merge remote-tracking branch \'weave/master\' into \'weave/aosp-master\' am: ↵Luis Hector Chavez
43625e411f am: f91e999fb2 am: 389403d794 am: fa44197670 * commit 'fa44197670399e2f5fd61ff7baa15fa13a793bcc': libweave: Update libchrome APIs to r395517 examples: remove samples with private traits correcting volume property maximum value in if condition checking of volume trait of test_schema device. Add volume trait to the test_schema device. Change-Id: Id6f1e8f8f773485a4f44a01da592ee8d962ec364
2016-05-31Merge remote-tracking branch \'weave/master\' into \'weave/aosp-master\' am: ↵Luis Hector Chavez
43625e411f am: f91e999fb2 am: 389403d794 * commit '389403d79405277ec53c450eccf33a8174f74964': libweave: Update libchrome APIs to r395517 examples: remove samples with private traits correcting volume property maximum value in if condition checking of volume trait of test_schema device. Add volume trait to the test_schema device. Change-Id: Ie2f8a0ad9bf9d4d47b6f902806ccc1de5379e718
2016-05-31Merge remote-tracking branch \'weave/master\' into \'weave/aosp-master\' am: ↵Luis Hector Chavez
43625e411f am: f91e999fb2 * commit 'f91e999fb2dc8a70365471277e846e7b8e7b3284': libweave: Update libchrome APIs to r395517 examples: remove samples with private traits correcting volume property maximum value in if condition checking of volume trait of test_schema device. Add volume trait to the test_schema device. Change-Id: I3d0cfb84e7251f27da0864752468be09f4867441
2016-05-31Merge remote-tracking branch \'weave/master\' into \'weave/aosp-master\'Luis Hector Chavez
am: 43625e411f * commit '43625e411feabd7df36a8768ba8c4eca58a22e4d': libweave: Update libchrome APIs to r395517 examples: remove samples with private traits correcting volume property maximum value in if condition checking of volume trait of test_schema device. Add volume trait to the test_schema device. Change-Id: I5f92a45cddfc50e5162cf3e443ef6b198e555e0b
2016-05-27Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'Luis Hector Chavez
eed24467 Add volume trait to the test_schema device. 369d2f07 correcting volume property maximum value in if condition checking of volume trait of test_schema device. d1f98a07 examples: remove samples with private traits 637be79 libweave: Update libchrome APIs to r395517 Change-Id: I69b312a616e67970f5cce82e7bd53a6dd266f36c
2016-05-27libweave: Update libchrome APIs to r395517Luis Hector Chavez
The new libchrome has been ported from Chromium and some APIs have changed. Make necessary changes at call sites. BUG: 28985443 TEST: All tests in libweave_test pass on dragonboard-eng build TEST: make testall Change-Id: Iccc8acbd968bc104af44a9053570edf028323cf5 Reviewed-on: https://weave-review.googlesource.com/3611 Reviewed-by: Alex Vakulenko <avakulenko@google.com>
2016-05-05examples: remove samples with private traitsJohan Euphrosine
Change-Id: Icd89ae8db2d73c398ab779748a35eeb35617bbe4 Reviewed-on: https://weave-review.googlesource.com/3270 Reviewed-by: Paul Westbrook <pwestbro@google.com>
2016-04-26correcting volume property maximum value in if condition checking of volume ↵Surender Kodam
trait of test_schema device. Change-Id: I446cf3e0dcdcd6f641d2d06f1b09fa2318793a68 Reviewed-on: https://weave-review.googlesource.com/3260 Reviewed-by: Alex Vakulenko <avakulenko@google.com>
2016-04-22Add volume trait to the test_schema device.Surender Kodam
Change-Id: I27d9575ad4710d0f9a8ad9b47cb800afd44c80fd Reviewed-on: https://weave-review.googlesource.com/3252 Reviewed-by: Alex Vakulenko <avakulenko@google.com>
2016-04-21Merge "Merge remote-tracking branch \'weave/master\' into ↵Alex Vakulenko
\'weave/aosp-master\'" into aosp-master am: 51805a169e am: e6ed8e260b am: bfee0fa1d2 am: 78b7705064 * commit '78b7705064abcfac82fb969ab5d5da49532c35c8': libweave: Split "base" trait into "device" and "privet". libweave: Clean up code libweave: Fix build break on Brillo libweave: Update comment on handling new commands README: update pre-requisites libweave: Reformat examples/provider/README libweave: Remove unused local constant add _ledflasher traits to the test_schema device. Change-Id: Ide9d2b43d6034823556ebe2cd9ece12bad968752
2016-04-21Merge "Merge remote-tracking branch \'weave/master\' into ↵Alex Vakulenko
\'weave/aosp-master\'" into aosp-master am: 51805a169e am: e6ed8e260b am: bfee0fa1d2 * commit 'bfee0fa1d24956b19909724ce7c30a9028ebe9ac': libweave: Split "base" trait into "device" and "privet". libweave: Clean up code libweave: Fix build break on Brillo libweave: Update comment on handling new commands README: update pre-requisites libweave: Reformat examples/provider/README libweave: Remove unused local constant add _ledflasher traits to the test_schema device. Change-Id: Ieae81a4bdcf8d5e6e94a9c21d609f6da5ed4e2eb
2016-04-21Merge "Merge remote-tracking branch \'weave/master\' into ↵Alex Vakulenko
\'weave/aosp-master\'" into aosp-master am: 51805a169e am: e6ed8e260b * commit 'e6ed8e260bf583568872a620450bef0cb76ae4e3': libweave: Split "base" trait into "device" and "privet". libweave: Clean up code libweave: Fix build break on Brillo libweave: Update comment on handling new commands README: update pre-requisites libweave: Reformat examples/provider/README libweave: Remove unused local constant add _ledflasher traits to the test_schema device. Change-Id: Ic66772a1cf0dc35f22065a15f91dc89d83ba69be
2016-04-21Merge "Merge remote-tracking branch \'weave/master\' into ↵android-wear-n-preview-3android-wear-n-preview-1android-n-preview-3Alex Vakulenko
\'weave/aosp-master\'" into aosp-master am: 51805a169e * commit '51805a169e3ac961a84d6de222b0797cfff0f919': libweave: Split "base" trait into "device" and "privet". libweave: Clean up code libweave: Fix build break on Brillo libweave: Update comment on handling new commands README: update pre-requisites libweave: Reformat examples/provider/README libweave: Remove unused local constant add _ledflasher traits to the test_schema device. Change-Id: Ibd03175ebca5bcd43a4ae81cd8bcb1641f95a15b
2016-04-21Merge "Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'" ↵Gerrit Code Review
into aosp-master
2016-04-21Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'Alex Vakulenko
5e67ce2 libweave: Split "base" trait into "device" and "privet". 22ca81a libweave: Clean up code 3f59975 libweave: Fix build break on Brillo e90f36f libweave: Update comment on handling new commands bf7d663 README: update pre-requisites 8ee0c1e libweave: Reformat examples/provider/README daeafc6 libweave: Remove unused local constant 25845ac add _ledflasher traits to the test_schema device. Change-Id: I379a48da3fc955cd553a8954ffad8af47eb3200f
2016-04-21libweave: Split "base" trait into "device" and "privet".Alex Vakulenko
The original "base" trait has been split into two and those traits have slightly different definitions (e.g. now device name, description and location are part of "device" trait's state, instead of the global device resource). Updated tests to reflect the new traits. BUG: None Change-Id: I9a1a1bfc3c01d67dd0ac519106c5d20c25a62f38 Reviewed-on: https://weave-review.googlesource.com/3146 Reviewed-by: Alex Vakulenko <avakulenko@google.com>
2016-04-20libweave: Clean up codeAlex Vakulenko
Fixed minor issues like misspelling in comments, formatting. Removed unused function prototypes and make sure function declarations match exactly the implementations. Change-Id: Ie30342657c0c22fa19b1546321400cc65d0e028d Reviewed-on: https://weave-review.googlesource.com/3230 Reviewed-by: Robert Ginda <rginda@google.com>
2016-04-18am: 76915d0 - libweave: Fix build break on Brillo am: 85e69f5 am: a574810Alex Vakulenko
am: e43fcb8 * commit 'e43fcb81e4c01ac84ff92cc7de5743bc5346c462': am: 76915d0 - libweave: Fix build break on Brillo Change-Id: I64d05f0f59bc0224c80d8f8ebfcb5fd1b4ca437e
2016-04-18libweave: Fix build break on Brillo am: 76915d0 -s ours am: 4184f1a am: bfd5564Alex Vakulenko
am: f354a04 * commit 'f354a04823601363c62eeced6204fd1cc887a9d6': libweave: Fix build break on Brillo Change-Id: I43ffd64d157446ed6701e510eece05b3db1580bd
2016-04-18am: 76915d0 - libweave: Fix build break on Brillo am: 85e69f5Alex Vakulenko
am: a574810 * commit 'a574810a80d4366e6afd0bd46716dab74d858f6c': am: 76915d0 - libweave: Fix build break on Brillo Change-Id: I04ce4c6a08ebe7759d1391f4f4a9ff1ba519e7b4
2016-04-18libweave: Fix build break on Brillo am: 76915d0 -s ours am: 4184f1aAlex Vakulenko
am: bfd5564 * commit 'bfd5564d470de3c31ba22809db01a276d6164def': libweave: Fix build break on Brillo Change-Id: I8f37132001316607c90bb711b4abd4097b55a189
2016-04-18am: 76915d0 - libweave: Fix build break on BrilloAlex Vakulenko
am: 85e69f5 * commit '85e69f51ade1576a3c3e85ab49b6f0496cd309f9': am: 76915d0 - libweave: Fix build break on Brillo Change-Id: Ibdf5e0889da9d18457adae264866d5bbfe76a7ba
2016-04-18libweave: Fix build break on Brillo am: 76915d0 -s oursAlex Vakulenko
am: 4184f1a * commit '4184f1a85b02e7331a193631da8d6d3dd14a3fbb': libweave: Fix build break on Brillo Change-Id: Id29f47cf9fbd57b5b8a9f68062ae5b883ade87e1
2016-04-18am: 76915d0 - libweave: Fix build break on BrilloAlex Vakulenko
The private member |currently_online_| is no longer used and causes the following error on Android/Brillo builds: external/libweave/src/privet/wifi_bootstrap_manager.h:109:8: error: private field 'currently_online_' is not used [-Werror,-Wunused-private-field] Remove the field to fix the compile break. Change-Id: I0830a4d12f777956638a12514565bb2270680e34
2016-04-18libweave: Fix build break on BrilloAlex Vakulenko
am: 76915d0 -s ours * commit '76915d0ba35aeca907be1a500032b078152f05d4': libweave: Fix build break on Brillo Change-Id: Ifdeb8801acaebddb0dbd34f26fcae43ab7888d07
2016-04-18libweave: Fix build break on BrilloAlex Vakulenko
The private member |currently_online_| is no longer used and causes the following error on Android/Brillo builds: external/libweave/src/privet/wifi_bootstrap_manager.h:109:8: error: private field 'currently_online_' is not used [-Werror,-Wunused-private-field] Remove the field to fix the compile break. Change-Id: I0830a4d12f777956638a12514565bb2270680e34 Reviewed-on: https://weave-review.googlesource.com/3221 Reviewed-by: Robert Ginda <rginda@google.com>
2016-04-18libweave: Fix build break on BrilloAlex Vakulenko
The private member |currently_online_| is no longer used and causes the following error on Android/Brillo builds: external/libweave/src/privet/wifi_bootstrap_manager.h:109:8: error: private field 'currently_online_' is not used [-Werror,-Wunused-private-field] Remove the field to fix the compile break. Change-Id: I0830a4d12f777956638a12514565bb2270680e34 Reviewed-on: https://weave-review.googlesource.com/3220 Reviewed-by: Robert Ginda <rginda@google.com>
2016-04-13Fix unused field errors am: 030a721Christopher Wiley
am: 9db44a9 * commit '9db44a90406efa4695c14ff062439f1f6f20b1de': Fix unused field errors Change-Id: I0329d93b7e139434d73f5971b4eb710ecde1205a
2016-04-13Fix unused field errorsChristopher Wiley
am: 030a721 * commit '030a7214cae0dad95904f285ffd7d8f39aa62bfc': Fix unused field errors Change-Id: I761995c230fb378299f05f16e0cc84b8031c2473
2016-04-13Fix unused field errorsChristopher Wiley
A recent update to libchrome reveals that we were previously suppressing warnings about unused private fields. Bug: 28117776 Change-Id: I08a71eab98a0a1bfd30a1c58b7f9071f7a5a9e96 Test: This now compiles.
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 06:10:30 +0000