Commit Graph
70 Commits
Author SHA1 Message Date
Alexey Polyudov d3dd15e460 Apply OSS fixes
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I0007cccbb113c72ea2d9786d04e3337b8e498611
2020-09-14 02:02:36 -07:00
Alexey Polyudov e31189892d Merge branch 'master' into release
Change-Id: I5545ab2431ea72b0dc51d98d16f0ac100787a2d9
2020-09-14 02:01:48 -07:00
Alexey Polyudov dc65625d36 Merge branch 'google3'
Change-Id: Iac43cc18efc80e7cca66ffa7cd2e472603ac4afc
2020-09-14 02:01:04 -07:00
Alexey Polyudov 3b7071cf0f Roll forward to cl/331498408
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: If30a8df80799adec3aafba5b8dd4c539fc21e16d
2020-09-14 02:00:27 -07:00
Alexey Polyudov eb3315ee3d Merge branch 'master' into release
Change-Id: I89401ad2264e728c6a9e5feadf00f92ce60c7248
2020-09-03 02:23:32 -07:00
Alexey Polyudov a0651b817a Merge branch 'google3'
Change-Id: I019ed6ec4eb0539d364af44dcc27587914131b47
2020-09-03 02:11:01 -07:00
Alexey Polyudov d5bed12d40 Roll forward to cl/329875420
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I50e284b30472160a409829957b2cb3926babfede
2020-09-03 02:09:56 -07:00
Alexey Polyudov 2d564a5539 OSS fixes
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I7589a4099e17cf812494d9bf758b479eaffff329
2020-08-25 11:36:27 -07:00
Alexey Polyudov 01e22ef713 Merge branch 'master' into release
Change-Id: I1301beacba87281b5818eb5e3f54525919158918
2020-08-25 11:34:15 -07:00
Alexey Polyudov 2994e4f134 Merge branch 'google3'
Change-Id: Ib74e01d47d15deb01314cacd8f67815515d7a31a
2020-08-25 11:32:00 -07:00
Alexey Polyudov c673bf6ac0 Roll forward to cl/328359974
Change-Id: If2b57ecc852aecf7dea454648f485fd7c08e72a9
2020-08-25 11:27:27 -07:00
Alexey Polyudov 65ded1d0e0 Merge branch 'master' into release
Change-Id: Ieb7f2b392864096e9cd783ab89f32442bc57abe7
2020-07-15 11:17:51 -07:00
Alexey Polyudov 663db687ec Merge branch 'google3' into master
Change-Id: I370d06668a5be888d5cc34afe3a9247694cfb9c0
2020-07-15 11:17:23 -07:00
Alexey Polyudov 6f9228fa6b Roll forward to cl/321106672
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: Iabb20e9c7f7487268fa3ebbbeb58540092e10e0e
2020-07-15 11:16:39 -07:00
Alexey Polyudov 57754ad65b Oss fix
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I0ddbfaa28d7280197bf5ac4dcf1a407ade5bdc7d
2020-07-07 12:55:46 -07:00
Alexey Polyudov ef97891ec3 Merge branch 'master' into release
Change-Id: I8a6cfe28093bf3d60dc91bcbc4e98e641764c4c0
2020-07-07 12:54:19 -07:00
Alexey Polyudov 8216e230a8 Merge branch 'google3' into master
Change-Id: Ibf73c8b6289591d08b5075af535ce13553442ee8
2020-07-07 12:51:12 -07:00
Himanshu Jaju 59cd56ec82 Change smhasher path
Changes the smhasher path to "smhasher/src/file" from "smhasher/file"
for easier import in Chromium land.

Change-Id: Ide6aa844fd8f37c9100e89d6a0bcb945b0860227
2020-07-07 12:46:30 -07:00
Alexey Polyudov 999cdd9903 Roll forward to cl/320013226
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I8be5378519ca952da43c40fba96141a7f8517748
2020-07-07 12:35:39 -07:00
Alexey Polyudov fc41a86ba2 Merge branch 'master' into release
Change-Id: Iaeb2144000bba05bf9532a55518b9549d7662361
2020-06-30 00:29:25 -07:00
Alexey Polyudov 07c6fcbdf0 Merge branch 'google3'
Change-Id: Ic0929c69225dba30ae0aa9bec2d5ce155fd927c0
2020-06-30 00:28:19 -07:00
Alexey Polyudov 5142ef11af Roll forward to cl/318932159
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: Ia0cddfc8cf46c66d5739bdb45ab7825422912082
2020-06-30 00:27:57 -07:00
Alexey Polyudov 1c44f4bbdd OSS fix
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I7c1c0f3e1f60df706e47a90ed43a6878f665ae85
2020-06-24 18:21:36 -07:00
Alexey Polyudov 8f77e10f9b Merge branch 'master' into release
Change-Id: I09eb3de26d6e77008add7091c6ebdbd0e4d5575a
2020-06-24 18:20:45 -07:00
Alexey Polyudov 30039f266f Merge branch 'google3'
Change-Id: I0c3068279f34e50b286caf84940281f5b5e4dfbb
2020-06-24 18:19:54 -07:00
Alexey Polyudov a4ef9ee564 Roll forward to cl/318180324
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I71bb49fe74104964088d392b12775ec2a253b1c9
2020-06-24 18:15:07 -07:00
Alexey Polyudov 0e92da687a Add mediums/proto to the list of exported paths
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I85d5e9ce51b7fee7df7d0750d5fb9af58af159bc
2020-06-24 17:17:07 -07:00
Alexey Polyudov a9f42d7a71 OSS fix
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I49defdf33502bd2921ef81b8430eb15ed14532a0
2020-06-24 11:02:33 -07:00
Alexey Polyudov 7be16eb015 Merge branch 'master' into release
Change-Id: I56ea2217899e92bdd9d6cb56797ac9895e194fff
2020-06-24 11:01:46 -07:00
Alexey Polyudov 412273d317 Merge branch 'google3'
Change-Id: I2c5f890e76873090819e7569b214af829bfd0daf
2020-06-24 10:57:51 -07:00
Alexey Polyudov f90b8a82a1 Merge branch 'master' into release
Change-Id: I96a006b2f3f3ebf1039aa043720e520d0ca53664
2020-06-24 10:45:24 -07:00
Alexey Polyudov 6b27a508ed nearby: snapshot of cl/317978613
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I4bf367877a986910bb03e1c54aa972b4bcd59942
2020-06-23 19:52:26 -07:00
Alexey Polyudov 32828732ff Update oss scripts
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I57a29ead382a00c048ee5f26c1fc242c7dac1e2d
2020-06-23 18:45:34 -07:00
Alexey Polyudov 96c2ceaa90 Switch to google/ukey2 submodule
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: Ieeeef4ea2e12f7d87a63a8c89a107218010253a2
2020-06-23 18:37:49 -07:00
Alexey Polyudov c3484b01c8 Switch internal URLs to public
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I1560870c3cf61256a6a28bd9aef42f0e3bc33d28
2020-06-04 23:18:32 -07:00
Alexey Polyudov f4007e63ce Improve copyrihgt header detection
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: Ib1c0928bc1323dc9b76e0f1fc64d4cb50b520ea6
2020-06-04 16:17:04 -07:00
Alexey Polyudov f307784c97 Add OSS mandatory file
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I2068d59ffaf55c80a66ff9068f678a6b080b5a1a
2020-06-04 15:03:55 -07:00
Alexey Polyudov 0cabddbff7 Update helper scripts
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: Ibaa0221a6cf55775f882d7888272e317ae3e2298
2020-06-04 13:43:50 -07:00
Alexey Polyudov 0e87f41216 Merge branch 'master' into release
Change-Id: I6e5c45cffa1cae932ca1e7294f3b6ef1be26b8ee
2020-06-04 13:04:42 -07:00
Alexey Polyudov 264ff0256d Merge branch 'google3'
Change-Id: I08c677177d69e257e6fbe6aa32a5854e0eae8c52
2020-06-04 12:44:32 -07:00
Himanshu Jaju fdd8038428 Fix oss.py script
- Adds newline fix from release branch
- Adds transformation for MessageLite from google3 to open source

Change-Id: Ie6c3f5263417fbbccc67835eb22fbe568a249125
2020-06-04 20:19:58 +01:00
Alexey Polyudov 04473705f8 Merge branch 'master' into release.
Change-Id: Id627ceca5ef60281e024ff80fc1848b3ccb6c14d
2020-06-04 12:01:48 -07:00
Himanshu Jaju e2a07376f4 Roll forward to cl/314747126
Change-Id: I858d3227b44ca6d727b39fae95358df58fce9c1b
2020-06-04 19:24:33 +01:00
Alexey Polyudov 841b92e943 Merge branch 'google3'
this is a merge commit based on a work done here:

https://team-review.git.corp.google.com/c/nearby-eng/nearby/+/761959

the difference with the former is: this one is tracking both heads of a merge

Change-Id: I8b28b1d3a5280581f20e4edf9144641a12df8879
2020-06-04 18:08:45 +00:00
Alexey Polyudov 3e7bf3074f Merge branch 'google3'
Change-Id: I8b28b1d3a5280581f20e4edf9144641a12df8879
2020-06-04 10:57:23 -07:00
Alexey Polyudov 7e19ffbab7 Release based on cl/313536507.
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I83ec7dee1a7ef6f4bdfd47482c94d03910525b7e
2020-06-04 10:06:31 -07:00
Himanshu Jaju cffbc04508 Roll forward to cl/314549634
Change-Id: I4d1e7eacd5fa4078a094571ad6d5f51e422535ff
2020-06-03 11:18:32 -07:00
Himanshu Jaju b13316ba93 Add lite_runtime option for protos
Open sourced protos have additional lite_runtime optimization to avoid
depending on the full protobuf library which is heavier.

Change-Id: Ia4d96bcb792b56d0cae78142cd515f0d7fb3d006
2020-06-02 12:12:18 +01:00
Alexey Polyudov 91e925c873 Merge branch 'google3'
Change-Id: Ibebf84b98939ee8e5006beedc34d225e8c2dd413
2020-05-28 01:36:50 -07:00
Alexey Polyudov ae1c427b99 nearby: snapshot of cl/313536507
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I8936b527079074d5c3af5531b9245063767cc4a7
2020-05-28 00:03:22 -07:00