Commit Graph

31445 Commits

Author SHA1 Message Date
f7d55dccfb Use x86-specific source files only for x86 target
Previously, we used x86-specific source files (those for sse2)
regardless of the target because x86 was the only supported host target.
This becomes a problem as we add the support for the new ARM64 host
target - linux_bionic_arm64. Now, those source files are built only when
the target architecture is x86.

Bug: 159685774
Test: HOST_CROSS_OS=linux_bionic HOST_CROSS_ARCH=arm64 m \
out/soong/host/linux_bionic-arm64/bin/webRTC

Change-Id: Id13d66ccd5ae6f8596ce32d4ccb2735856d2159a
2020-09-21 11:59:06 +09:00
c47e6c7a2a [automerger skipped] Skip Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: b91873ac0a -s ours am: 4fc7603462 -s ours am: eb42ef17e1 -s ours am: 24b01394c5 -s ours
am skip reason: Change-Id I02a488ce82be251d29358124810c4e96963d73e2 with SHA-1 973c7ccea0 is in history

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

Change-Id: I6123cb71f4776480a73025a34de2e74a462d10c8
2020-08-28 04:59:06 +00:00
24b01394c5 [automerger skipped] Skip Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: b91873ac0a -s ours am: 4fc7603462 -s ours am: eb42ef17e1 -s ours
am skip reason: Change-Id I02a488ce82be251d29358124810c4e96963d73e2 with SHA-1 973c7ccea0 is in history

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

Change-Id: I3de226aea01c4d8523eda320dbaec31caf4c18d6
2020-08-28 04:42:09 +00:00
eb42ef17e1 [automerger skipped] Skip Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: b91873ac0a -s ours am: 4fc7603462 -s ours
am skip reason: Change-Id I02a488ce82be251d29358124810c4e96963d73e2 with SHA-1 973c7ccea0 is in history

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

Change-Id: Ic230b410a819b6271e4e5d3d63064251098839db
2020-08-28 04:01:06 +00:00
4fc7603462 [automerger skipped] Skip Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: b91873ac0a -s ours
am skip reason: Change-Id I02a488ce82be251d29358124810c4e96963d73e2 with SHA-1 973c7ccea0 is in history

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

Change-Id: I504e627252cd484dad9e3904b0c08f528b7a41ef
2020-08-28 03:25:53 +00:00
b91873ac0a Skip Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: I02a488ce82be251d29358124810c4e96963d73e2
Change-Id: Ic01c81c0b3b7f287ce75316b5837906157e140c6
2020-08-27 18:56:20 -07:00
add5f131d4 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
2020-07-28 19:33:53 +00:00
e08edb625c Merge "Update scripts for merging with upstream" am: 081f2a69ce am: eae5ab089c am: 8713db69cd am: a817e159e6
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/1374136

Change-Id: I09dd96a706e4087b9c072d31693824d555af95a0
2020-07-28 19:11:17 +00:00
a817e159e6 Merge "Update scripts for merging with upstream" am: 081f2a69ce am: eae5ab089c am: 8713db69cd
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/1374136

Change-Id: I21b3b1e7488c53b4364c89666bbb19e1b2c2dc85
2020-07-28 18:57:15 +00:00
8713db69cd 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
2020-07-28 18:36:48 +00:00
eae5ab089c Merge "Update scripts for merging with upstream" am: 081f2a69ce
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/1374136

Change-Id: I7aa89f5fa91906d48b377616d735134877e7d1a8
2020-07-28 18:20:51 +00:00
081f2a69ce Merge "Update scripts for merging with upstream" 2020-07-28 17:55:07 +00:00
8bbe1c501c Merge "Disable darwin build of webrtc" am: ff12d79867 am: 2504546d1a am: 6e8fe02381 am: 1bcf44c26b am: a05683ca9b
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/1373259

Change-Id: If9a040175709684b2853fd5c95f5348f2e8ad59d
2020-07-28 10:28:06 +00:00
a05683ca9b Merge "Disable darwin build of webrtc" am: ff12d79867 am: 2504546d1a am: 6e8fe02381 am: 1bcf44c26b
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/1373259

Change-Id: I1709e265167c4908f10bc789198736e823a5fd7d
2020-07-28 10:09:41 +00:00
1bcf44c26b Merge "Disable darwin build of webrtc" am: ff12d79867 am: 2504546d1a am: 6e8fe02381
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/1373259

Change-Id: Ibfb01da5cd6be0394620e52967c0669539837820
2020-07-28 09:57:44 +00:00
6e8fe02381 Merge "Disable darwin build of webrtc" am: ff12d79867 am: 2504546d1a
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/1373259

Change-Id: Ib7cf356149da86a2030b2775d6a69028102d30a8
2020-07-28 09:44:22 +00:00
b045a3fbd7 Update scripts for merging with upstream
Bug: 153469641
Test: ./android_tools/generate_android_bp.sh
Change-Id: I8eec3d828a609dff1ca401f258fead9b1ed32e90
2020-07-28 17:20:25 +08:00
2504546d1a Merge "Disable darwin build of webrtc" am: ff12d79867
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/1373259

Change-Id: I7a7f9e3fc148b30f3d54fe298ee430998f50756c
2020-07-28 09:19:40 +00:00
ff12d79867 Merge "Disable darwin build of webrtc" 2020-07-28 09:04:29 +00:00
50b1ad41ea Disable darwin build of webrtc
libopus and libvpx are disabled on darwin.

Bug: 162102724
Test: TH
Change-Id: Id8787e81058053da18b43a85b3d6ececbaa3af91
2020-07-28 05:50:35 +00:00
cafd60c6a1 Merge changes Ie9a90d2f,Ida3bfe62,I2d596942 am: 4ba59966b7 am: b21a5246fa am: dbbe558275 am: f0c311ee68 am: aa6cad70da
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/1369420

Change-Id: I81faec63aa8b43aa70a88e19777bac80e62f933d
2020-07-25 00:46:28 +00:00
36e5fc43b6 [automerger skipped] Merge remote-tracking branch 'upstream-master' am: 8e1bf7eee4 am: 08a471a024 am: 398a3ba7c3 am: 0963fdec0c am: e7933cf340 -s ours
am skip reason: Change-Id Ida3bfe62ef5c6549278f4c155a1f690b008e9b9d with SHA-1 206ccd0b36 is in history

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

Change-Id: Ie0128584b26b55f9f83ff3b866060cae0cbb375c
2020-07-25 00:46:26 +00:00
2be86697af [automerger skipped] Generate new Android.bp file and correct build errors am: b6df60492c am: 1206c45de1 am: 024d59e7a7 am: 8eccf236f8 am: 41450a5356 -s ours
am skip reason: Change-Id I2d596942e34093dccc65d4b7b8249b6afc14d31f with SHA-1 889b21a2e1 is in history

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

Change-Id: I5d6aa3e6f9d300db1d5c280016abe99aa8551e8f
2020-07-25 00:46:24 +00:00
aa6cad70da Merge changes Ie9a90d2f,Ida3bfe62,I2d596942 am: 4ba59966b7 am: b21a5246fa am: dbbe558275 am: f0c311ee68
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/1369420

Change-Id: Ie871b7124ca59cc70055a986d8b3d87ddd21987e
2020-07-25 00:28:20 +00:00
e7933cf340 Merge remote-tracking branch 'upstream-master' am: 8e1bf7eee4 am: 08a471a024 am: 398a3ba7c3 am: 0963fdec0c
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/1369419

Change-Id: I124b7ff7d404a52e1b0b3fa7287ba0d48d606a0e
2020-07-25 00:28:14 +00:00
41450a5356 Generate new Android.bp file and correct build errors am: b6df60492c am: 1206c45de1 am: 024d59e7a7 am: 8eccf236f8
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/1358846

Change-Id: Iaa9dd5f7d737cb2d515846f8037f713e3d7886b7
2020-07-25 00:28:11 +00:00
f0c311ee68 Merge changes Ie9a90d2f,Ida3bfe62,I2d596942 am: 4ba59966b7 am: b21a5246fa am: dbbe558275
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/1369420

Change-Id: Iedf9f02247f9570968078706cf2ac333825d309f
2020-07-25 00:10:57 +00:00
0963fdec0c Merge remote-tracking branch 'upstream-master' am: 8e1bf7eee4 am: 08a471a024 am: 398a3ba7c3
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/1369419

Change-Id: Ia378a6c8a6d01983f1c57f994a4be2fc341264e9
2020-07-25 00:10:51 +00:00
8eccf236f8 Generate new Android.bp file and correct build errors am: b6df60492c am: 1206c45de1 am: 024d59e7a7
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/1358846

Change-Id: Ie829283b3180d93489ed4fe9703e77e7e3b25930
2020-07-25 00:10:49 +00:00
dbbe558275 Merge changes Ie9a90d2f,Ida3bfe62,I2d596942 am: 4ba59966b7 am: b21a5246fa
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/1369420

Change-Id: Ieaeb137cc3fcde4bd014eae9f57ccedc43580796
2020-07-24 23:57:22 +00:00
398a3ba7c3 Merge remote-tracking branch 'upstream-master' am: 8e1bf7eee4 am: 08a471a024
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/1369419

Change-Id: I579398a5d73f272191503e229636be5cf75fd138
2020-07-24 23:57:16 +00:00
024d59e7a7 Generate new Android.bp file and correct build errors am: b6df60492c am: 1206c45de1
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/1358846

Change-Id: I10dd254b34af35cb422b998fee23649bd9a7b1d4
2020-07-24 23:57:13 +00:00
b21a5246fa Merge changes Ie9a90d2f,Ida3bfe62,I2d596942 am: 4ba59966b7
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/1369420

Change-Id: Id685e49ebd83cff5f5e82ac8a7e66fce7af07f23
2020-07-24 23:39:30 +00:00
08a471a024 Merge remote-tracking branch 'upstream-master' am: 8e1bf7eee4
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/1369419

Change-Id: Ic1dd9cdd58344ea768e5ccacbd9289dffdf858b0
2020-07-24 23:39:25 +00:00
1206c45de1 Generate new Android.bp file and correct build errors am: b6df60492c
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/1358846

Change-Id: I39cd125b095adbd0aed6b426d61a1266545068dc
2020-07-24 23:39:22 +00:00
4ba59966b7 Merge changes Ie9a90d2f,Ida3bfe62,I2d596942
* changes:
  Add some scripts useful for merging with upstream-master
  Merge remote-tracking branch 'upstream-master'
  Generate new Android.bp file and correct build errors
2020-07-24 23:27:38 +00:00
9e9b79187b Merge changes Ida3bfe62,I2d596942
* changes:
  Merge remote tracking branch 'upstream-master'
  Generate new Android.bp file and correct build errors
2020-07-23 23:07:18 +00:00
37f9b0ea9e [automerger skipped] Merge "Merge branch 'upstream-master'" am: e41ddee6b4 -s ours am: 1af77b4142 -s ours am: 798edca709 -s ours am: a1c83112e4 -s ours am: f729d2b387 -s ours
am skip reason: Change-Id Ic33e363deb0d1ac4bb4d57c3c239eb2e45370802 with SHA-1 d1c647242a is in history

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

Change-Id: Ia182f523511a1a30b769c2c331fa2c4b2aba06c2
2020-07-23 21:24:41 +00:00
f729d2b387 [automerger skipped] Merge "Merge branch 'upstream-master'" am: e41ddee6b4 -s ours am: 1af77b4142 -s ours am: 798edca709 -s ours am: a1c83112e4 -s ours
am skip reason: Change-Id Ic33e363deb0d1ac4bb4d57c3c239eb2e45370802 with SHA-1 d1c647242a is in history

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

Change-Id: Id13ab6b7b5115cb4b7c890459fa5468fa7b5a1ae
2020-07-23 21:07:15 +00:00
a1c83112e4 [automerger skipped] Merge "Merge branch 'upstream-master'" am: e41ddee6b4 -s ours am: 1af77b4142 -s ours am: 798edca709 -s ours
am skip reason: Change-Id Ic33e363deb0d1ac4bb4d57c3c239eb2e45370802 with SHA-1 d1c647242a is in history

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

Change-Id: Ia5ef2db93849dd927ef68bb7c715d6894c2b36a6
2020-07-23 20:54:40 +00:00
6a057ef552 Add some scripts useful for merging with upstream-master
Bug: 153469641
Test: mm
Change-Id: Ie9a90d2ffb0a83e513bc90e2e906e2e8ab369981
2020-07-23 13:38:19 -07:00
8e1bf7eee4 Merge remote-tracking branch 'upstream-master'
Bug: 153469641
Test: run cuttlefish locally
Change-Id: Ida3bfe62ef5c6549278f4c155a1f690b008e9b9d
Merged-In: Ida3bfe62ef5c6549278f4c155a1f690b008e9b9d
2020-07-23 13:37:44 -07:00
798edca709 [automerger skipped] Merge "Merge branch 'upstream-master'" am: e41ddee6b4 -s ours am: 1af77b4142 -s ours
am skip reason: Change-Id Ic33e363deb0d1ac4bb4d57c3c239eb2e45370802 with SHA-1 d1c647242a is in history

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

Change-Id: Id8a56a72b7c91fa60947693bec9beb2c1a290678
2020-07-23 20:35:54 +00:00
b6df60492c Generate new Android.bp file and correct build errors
The following are not yet available in their respective libraries so
attempts to use it in webrtc result in a call to abort():
* libvpx's CONSTRAINED_FROM_ABOVE_DROP constant
* libyuv's I010 buffers

The original webrtc project expects to have third party libraries
checked out in third_party/ and base/third_party/. Added some headers
in those directories with a single line including the right header from
external/<library>. Updated .gitignore to keep track of said headers.

Bug: 153469641
Test: mm, also built cuttlefish using this library and ran it locally
Change-Id: I2d596942e34093dccc65d4b7b8249b6afc14d31f
Merged-In: I2d596942e34093dccc65d4b7b8249b6afc14d31f
2020-07-23 13:34:20 -07:00
1af77b4142 [automerger skipped] Merge "Merge branch 'upstream-master'" am: e41ddee6b4 -s ours
am skip reason: Change-Id Ic33e363deb0d1ac4bb4d57c3c239eb2e45370802 with SHA-1 d1c647242a is in history

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

Change-Id: Iec9fe0782c52c13be1dd604aff9b8c755105d58d
2020-07-23 20:23:47 +00:00
206ccd0b36 Merge remote tracking branch 'upstream-master'
Bug: 153469641
Test: run cuttlefish locally
Change-Id: Ida3bfe62ef5c6549278f4c155a1f690b008e9b9d
2020-07-23 13:08:51 -07:00
e41ddee6b4 Merge "Merge branch 'upstream-master'" 2020-07-23 19:53:36 +00:00
6385c48cd6 [automerger skipped] Merge branch 'upstream-master' am: d1c647242a -s ours am: 107719457e -s ours am: 0d145d1783 -s ours am: 92d3e13be0 -s ours
am skip reason: Change-Id Ic33e363deb0d1ac4bb4d57c3c239eb2e45370802 with SHA-1 d4cf4096a2 is in history

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

Change-Id: I9e8ddf0d8b4a858beaeb62a8d8e1e223a606abff
2020-07-23 10:04:34 +00:00
92d3e13be0 [automerger skipped] Merge branch 'upstream-master' am: d1c647242a -s ours am: 107719457e -s ours am: 0d145d1783 -s ours
am skip reason: Change-Id Ic33e363deb0d1ac4bb4d57c3c239eb2e45370802 with SHA-1 d4cf4096a2 is in history

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

Change-Id: I120913c709428cc6dcaec50527dbe0b4b41af89b
2020-07-23 09:52:41 +00:00
0d145d1783 [automerger skipped] Merge branch 'upstream-master' am: d1c647242a -s ours am: 107719457e -s ours
am skip reason: Change-Id Ic33e363deb0d1ac4bb4d57c3c239eb2e45370802 with SHA-1 d4cf4096a2 is in history

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

Change-Id: I43f03c372d6be90002d1e029c0e0c134ba1c1019
2020-07-23 09:38:04 +00:00