Merge "Update scripts for merging with upstream" am: 081f2a69ce

Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/1374136

Change-Id: I7aa89f5fa91906d48b377616d735134877e7d1a8
This commit is contained in:
Treehugger Robot
2020-07-28 18:20:51 +00:00
committed by Automerger Merge Worker

View File

@ -150,6 +150,11 @@ def GenerateDefault(targets):
print(' enabled: false,')
print(' },')
print(' },')
print(' target: {')
print(' darwin: {')
print(' enabled: false,')
print(' },')
print(' },')
print('}')
in_default['cflags'].extend([
"-Wno-unused-parameter",