aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-07-28 18:36:48 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-28 18:36:48 +0000
commit8713db69cd2c43c500abb9f5d5135ad3bd99aa32 (patch)
tree7d53d6f0ddd93b1444161475ee8dd6d23753652b
parent6e8fe02381de990b835622e392cca4c72d73d546 (diff)
parenteae5ab089cfa57ed3ee83ac03e83060ee0725244 (diff)
downloadwebrtc-8713db69cd2c43c500abb9f5d5135ad3bd99aa32.tar.gz
Merge "Update scripts for merging with upstream" am: 081f2a69ce am: eae5ab089c
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/1374136 Change-Id: I9e732b7b273d9b393a242e2057e62ef924e7a2b2
-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",