mirror of
https://github.com/kidfromjupiter/nearby.git
synced 2026-09-16 15:36:12 -04:00
Release based on cl/313536507.
Signed-off-by: Alexey Polyudov <apolyudov@google.com> Change-Id: I83ec7dee1a7ef6f4bdfd47482c94d03910525b7e
This commit is contained in:
@@ -76,7 +76,9 @@ def copy_files_to_oss_project(src_root, dst_root):
|
||||
shutil.rmtree(dst_root + "/proto", ignore_errors=True)
|
||||
shutil.copytree(src_root + "/proto", dst_root + "/proto/")
|
||||
shutil.copytree(src_root + "/cpp/platform/", dst_root + "/cpp/platform/")
|
||||
shutil.copytree(src_root + "/cpp/platform_v2/", dst_root + "/cpp/platform_v2/")
|
||||
shutil.copytree(src_root + "/connections/core/", dst_root + "/cpp/core/")
|
||||
shutil.copytree(src_root + "/connections/core_v2/", dst_root + "/cpp/core_v2/")
|
||||
shutil.copytree(src_root + "/connections/proto/", dst_root + "/proto/connections/")
|
||||
|
||||
def detect_file_copy_header_options(fname, lines):
|
||||
@@ -101,8 +103,12 @@ def post_process_oss_files(path, args):
|
||||
else:
|
||||
top_dirs = ["cpp", "proto"]
|
||||
transforms = (
|
||||
("third_party/webrtc/files/stable/", ""),
|
||||
("webrtc/files/stable/", ""),
|
||||
("third_party/", ""),
|
||||
("location/nearby/connections/core_v2", "core_v2"),
|
||||
("location/nearby/connections/core", "core"),
|
||||
("location/nearby/cpp/platform_v2", "platform_v2"),
|
||||
("location/nearby/cpp/platform", "platform"),
|
||||
("security/cryptauth/lib/securegcm", "securegcm"),
|
||||
("testing/base/public/gmock.h", "gmock/gmock.h"),
|
||||
@@ -116,6 +122,7 @@ def post_process_oss_files(path, args):
|
||||
("_portable_proto.pb.h", ".pb.h"),
|
||||
(".proto.h", ".pb.h"),
|
||||
)
|
||||
|
||||
for root, dirs, files in os.walk(path):
|
||||
if top_level and top_dirs:
|
||||
# we must convert cpp/ and proto/ subtrees.
|
||||
@@ -134,6 +141,8 @@ def post_process_oss_files(path, args):
|
||||
lines=[]
|
||||
google3_ignore = False
|
||||
with open(fname, "r") as f:
|
||||
add_proto_lite_runtime = args.proto_lite_runtime and fname.endswith(".proto")
|
||||
|
||||
for line in f:
|
||||
orig = line
|
||||
|
||||
@@ -158,6 +167,13 @@ def post_process_oss_files(path, args):
|
||||
if google3_ignore:
|
||||
modified = True
|
||||
continue
|
||||
|
||||
if add_proto_lite_runtime and line.startswith("option "):
|
||||
lines.append("option optimize_for = LITE_RUNTIME;")
|
||||
modified = True
|
||||
# LITE_RUNTIME should be added only once per file.
|
||||
add_proto_lite_runtime = False
|
||||
|
||||
lines.append(line)
|
||||
|
||||
if args.fix_oss_headers:
|
||||
@@ -167,6 +183,7 @@ def post_process_oss_files(path, args):
|
||||
prefix, offset = options
|
||||
lines = add_copyright(lines, prefix, offset)
|
||||
modified = True
|
||||
|
||||
if modified:
|
||||
with open(fname, "w") as f:
|
||||
for line in lines:
|
||||
@@ -187,6 +204,7 @@ def main():
|
||||
parser.add_argument('--no-copy', action='store_true', default=False)
|
||||
parser.add_argument('--no-subst', action='store_true', default=False)
|
||||
parser.add_argument('--no-recurse', action='store_true', default=False)
|
||||
parser.add_argument('--proto-lite-runtime', action='store_true', default=False)
|
||||
args = parser.parse_args()
|
||||
if args.google3_filter:
|
||||
print("google3-specific code will be removed")
|
||||
|
||||
Reference in New Issue
Block a user