TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-16 07:36:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into release.

Browse Source 
Change-Id: Id627ceca5ef60281e024ff80fc1848b3ccb6c14d
This commit is contained in:
Alexey Polyudov
2020-06-04 12:01:48 -07:00
parent 7e19ffbab7 3e7bf3074f
commit 04473705f8
98 changed files with 4136 additions and 718 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/handle_oss.sh
+1 -1
View File
@@ -17,4 +17,4 @@
./oss.py --all --google3-filter --no-subst --fix-oss-headers ../cmake
./oss.py --all --no-subst --fix-oss-headers .
./oss.py --all --google3-filter --no-subst --fix-oss-headers --no-recurse ..
./oss.py --google3-filter --fix-oss-headers ..
./oss.py --google3-filter --fix-oss-headers --proto-lite-runtime ..
script/oss.py
+3 -2
View File
@@ -169,8 +169,9 @@ def post_process_oss_files(path, args):
continue
if add_proto_lite_runtime and line.startswith("option "):
lines.append("option optimize_for = LITE_RUNTIME;")
modified = True
if not line.startswith("option optimize_for = LITE_RUNTIME"):
lines.append("option optimize_for = LITE_RUNTIME;\n")
modified = True
# LITE_RUNTIME should be added only once per file.
add_proto_lite_runtime = False