39a3db90ff
Merge "Export include dirs" am: f92ec5a27c
...
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/1347705
Change-Id: I02e9d2b9eaa8d8bfa87ad9349eb6affcd8312fa2
2020-06-24 01:22:24 +00:00
f92ec5a27c
Merge "Export include dirs"
2020-06-24 01:11:58 +00:00
8db44406d1
Export include dirs
...
Bug: 159726468
Test: m libeffects
Change-Id: I63782bfc073b64ed9b9cd5993d9f2c1a6b938672
2020-06-23 22:40:38 +00:00
862f8febb1
Merge "Add license type: BSD+Apache3+MIT+Boost = NOTICE" am: 6c84a6201a
...
Change-Id: Ie1ec3ac33d29601842b065e3ec7ed0469376441b
2020-04-24 20:16:08 +00:00
6c84a6201a
Merge "Add license type: BSD+Apache3+MIT+Boost = NOTICE"
2020-04-24 19:58:10 +00:00
7435232cb4
Add license type: BSD+Apache3+MIT+Boost = NOTICE
...
Bug: 68860345
Bug: 69058154
Bug: 151953481
Test: no code changes
Change-Id: I45d78acb11906621b4e91403c5e2c10dcd361fe6
2020-04-23 16:40:11 -07:00
66a1e930d1
DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master
...
Bug: 151763422
Change-Id: Ida26188ce6956f1276fd24ad19e0a598d3fa2e26
2020-04-09 17:51:00 -07:00
79e76ed1dc
DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: b6b0f3ddbb
...
Change-Id: I93fb5a83db4daf9e0ccfb0707dac0549f4131f10
2020-03-19 06:01:35 +00:00
b6b0f3ddbb
DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master
...
Bug: 151763422
Change-Id: Ie2dbaef724762c725d39339dafd80273827df44c
2020-03-18 19:40:44 -07:00
f81791c3b6
Merge "Remove mips workaround." am: 7856f35ede am: 4d875b4d48
...
Change-Id: Ic81b2e27d6bcc1c6e2b3cb2c273f6363742f0d51
2020-03-07 18:58:33 +00:00
4d875b4d48
Merge "Remove mips workaround." am: 7856f35ede
...
Change-Id: I41a21498f0b307c9e142f1017e68700baac16afb
2020-03-07 18:46:10 +00:00
7856f35ede
Merge "Remove mips workaround."
2020-03-07 18:27:41 +00:00
9f980fd8da
Remove mips workaround.
...
Test: treehugger
Change-Id: I09cff618d237260581b9d1fcfb4d0dbc93b2426f
2020-03-06 21:42:14 -08:00
cf0ffc92d1
Merge stage-aosp-master into pi-dev-plus-aosp
...
am: 1e28d6a1f2
Change-Id: I2ee63c5e7dc8ffa788af390d4622af9c191c351c
2019-02-25 05:24:53 -08:00
1e28d6a1f2
Merge stage-aosp-master into pi-dev-plus-aosp
...
Bug: 126125118
Change-Id: Ie271de2f3b5a59d7f8d785fe685f31a527f38971
2019-02-25 00:29:49 -08:00
cd952219d1
DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
...
Bug: 120848293
Change-Id: I2ec2592c9135b771a61543d059b78e320736fc9c
2019-02-20 16:19:03 -08:00
7f13043ede
Merge "Disable native_coverage for webrtc" am: 5d8bf68015 am: 8659d14bff
...
am: 14875d2698
Change-Id: I9cdde8e054367734218c7acbf4092a46f392d5fe
2019-02-19 12:06:13 -08:00
14875d2698
Merge "Disable native_coverage for webrtc" am: 5d8bf68015
...
am: 8659d14bff
Change-Id: I6f350eeed980c8761715dc2251fa27377ffc9d92
2019-02-19 11:51:46 -08:00
8659d14bff
Merge "Disable native_coverage for webrtc"
...
am: 5d8bf68015
Change-Id: If504e10094c980f26d12235011744a4cdd397d51
2019-02-19 11:27:30 -08:00
5d8bf68015
Merge "Disable native_coverage for webrtc"
2019-02-19 19:04:11 +00:00
15608438f7
Disable native_coverage for webrtc
...
Bug: http://b/116873221
Linking fails at O0 because VTable for InStream and OutStream (defined
in webrtc/common_types.h) is not found. The fix is to mark the Rewind
function in both classes as pure virtual.
It's better to disable native_coverage here rather than pick up a
downstream change to an external codebase.
Test: Build with coverage
Change-Id: I13375f8fa02c2e9330d30f091f069518e2908f51
2019-02-15 14:57:59 -08:00
5670883dd8
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 92197c43df -s ours am: be8d1a5b99 -s ours
...
am: 6b24b14ebf -s ours
Change-Id: I3a18e457808e18e7185dce159ab391763f24f62f
2018-10-24 19:16:50 -07:00
6b24b14ebf
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 92197c43df -s ours
...
am: be8d1a5b99 -s ours
Change-Id: I2b939ae3cfaff23b5757d28cc0abb1af5b31f778
2018-10-24 18:38:31 -07:00
be8d1a5b99
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
...
am: 92197c43df -s ours
Change-Id: Ic2f3c544f4751029af6735d635e9032a25bd5774
2018-10-24 16:57:22 -07:00
92197c43df
Merge pie-platform-release to aosp-master - DO NOT MERGE
...
Change-Id: Id465b51d34b2f2df9ad291beb2be8d03f862005f
2018-10-24 14:46:48 -07:00
fcc091c872
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 1cc6c594e2 -s ours
...
am: 6533582f95 -s ours
Change-Id: I33540a8123694e1855424dfba0784bc22a3b95f8
2018-10-24 11:17:32 -07:00
6533582f95
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
...
am: 1cc6c594e2 -s ours
Change-Id: I7eb57ab8852aace6d7bd86bb90409c2d055373c7
2018-10-24 10:57:06 -07:00
1cc6c594e2
Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
...
Change-Id: I2bb8116ffb8f9d56cd5799aff635cb7b62da6169
2018-10-24 09:06:40 -07:00
755198bb66
Merge "Remove dependency on std::tr1" am: 9d1c18ddd0 am: 7209da4601
...
am: 20c423cdf2
Change-Id: I29da17cbfc741de3312b19e19eaa3e1a83f3a033
2018-07-11 11:27:47 -07:00
20c423cdf2
Merge "Remove dependency on std::tr1" am: 9d1c18ddd0
...
am: 7209da4601
Change-Id: I1ec96b9d37ddf375e4ec6d0b633a5b96b086b08d
2018-07-11 11:22:42 -07:00
7209da4601
Merge "Remove dependency on std::tr1"
...
am: 9d1c18ddd0
Change-Id: I4fdb2586216d6ce5520bb47bf692a767d40c34a3
2018-07-11 11:18:40 -07:00
9d1c18ddd0
Merge "Remove dependency on std::tr1"
2018-07-11 18:08:28 +00:00
715411c11b
Remove dependency on std::tr1
...
This change is to make webrtc compatible with new googletest.
Test: compile
Change-Id: I91fa5ce8a986e35209986bef5dc0b2202155623f
2018-07-11 05:04:46 +00:00
e493b549e1
Merge "Add METADATA for webrtc" am: a95c577462 am: 1efc0f0c83
...
am: efa4661f26
Change-Id: I61c9b9ad4cb13431ca0ba12b9bdd2538d358a9c9
2018-07-10 19:51:06 -07:00
efa4661f26
Merge "Add METADATA for webrtc" am: a95c577462
...
am: 1efc0f0c83
Change-Id: I5ed2ecb4f80220285399a3882981edffc338b09e
2018-07-10 19:09:40 -07:00
1efc0f0c83
Merge "Add METADATA for webrtc"
...
am: a95c577462
Change-Id: I3628dba33bb3f3593eb4b5c66d595f3f02575c38
2018-07-10 17:52:00 -07:00
a95c577462
Merge "Add METADATA for webrtc"
2018-07-11 00:07:28 +00:00
a04cfef17d
Add METADATA for webrtc
...
Test: NA
Exempt-From-Owner-Approval: conflict with upstream OWNERS file
Change-Id: I28f133b0dfd684a8e83ce83c3f58ceda10f55f26
2018-07-10 15:11:57 -07:00
198d7d99a1
Snap for 4574286 from 4bf309ee56108e775a2d8f9676ee5b91c025b199 to pi-release
...
Change-Id: I3483a86a4bf6f8a2603689b24443cdbd34a26f8e
2018-01-30 08:24:40 +00:00
4bf309ee56
Merge "Add empty Android.mk to prevent recursion." am: dbf4e66374 am: c6ebc088d5
...
am: 9f02eec6dd
Change-Id: Ica423b2f555491560a66c4958f8cdd200d3fefbb
2018-01-30 02:46:55 +00:00
9f02eec6dd
Merge "Add empty Android.mk to prevent recursion." am: dbf4e66374
...
am: c6ebc088d5
Change-Id: I97d9b65784d9d75c0767d17e65c68ddeb6e5e12b
2018-01-30 02:44:23 +00:00
c6ebc088d5
Merge "Add empty Android.mk to prevent recursion."
...
am: dbf4e66374
Change-Id: Iff8ffb5b67b29598bd6aa3cacffeef3b6b63efea
2018-01-30 02:41:18 +00:00
dbf4e66374
Merge "Add empty Android.mk to prevent recursion."
2018-01-30 02:37:09 +00:00
5db02a518c
Add empty Android.mk to prevent recursion.
...
Bug: 72661763
Test: find . -name 'Android.mk'
Change-Id: I8373f1433561bd9ae4652dc58bd2fbcb8e7d721e
2018-01-29 16:31:28 -08:00
2fe8361f60
Snap for 4507345 from 84678cdad689bb05139ee4df1d0b6702979cc50f to pi-release
...
Change-Id: I7b7d30abc0217c9ae7f0e3f3f1200e028187ac5f
2017-12-17 08:30:13 +00:00
84678cdad6
Merge "Remove dead symlink." am: 6c96047132 am: e246bc0c46
...
am: 971b703804
Change-Id: I2d40eded09c7b479e77fd392a24f886b4dcfa033
2017-12-15 21:29:49 +00:00
971b703804
Merge "Remove dead symlink." am: 6c96047132
...
am: e246bc0c46
Change-Id: I16453b38257021818fa473996680864a421ad5f9
2017-12-15 21:26:41 +00:00
e246bc0c46
Merge "Remove dead symlink."
...
am: 6c96047132
Change-Id: I8178efea67947adcf4395a84b89f85dbe445dff4
2017-12-15 21:24:43 +00:00
6c96047132
Merge "Remove dead symlink."
2017-12-15 21:12:24 +00:00
09c7a57a50
Remove dead symlink.
...
Bug: none
Test: none
Change-Id: I0be329b9137db166320cb4820c8cd4bbcb8b3e7f
2017-12-15 11:01:06 -08:00
