aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-07-28 19:33:53 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-28 19:33:53 +0000
commitadd5f131d401c67a0023d284dd801c19c91c801c (patch)
tree7d53d6f0ddd93b1444161475ee8dd6d23753652b
parent8bbe1c501cfeb5fdd670605e4a1eac3197ecbadd (diff)
parente08edb625c9141cdbb8ca036f209a97290296e8b (diff)
downloadwebrtc-add5f131d401c67a0023d284dd801c19c91c801c.tar.gz
Merge "Update scripts for merging with upstream" am: 081f2a69ce am: eae5ab089c am: 8713db69cd am: a817e159e6 am: e08edb625c
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/1374136 Change-Id: I6ebaf9961872ce3b8d53ca474d1a4a13c829e594
-rwxr-xr-xandroid_tools/generate_bp.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/android_tools/generate_bp.py b/android_tools/generate_bp.py
index 874dbd1556..176bfb8688 100755
--- a/android_tools/generate_bp.py
+++ b/android_tools/generate_bp.py
@@ -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",