8d30244e68
Merge "Add license type: BSD+Apache3+MIT+Boost = NOTICE" am: 6c84a6201a am: 862f8febb1 am: 68c68dca42 am: 78b814544d am: fc138190e6
...
Change-Id: I278dbae2d6ba9ae21227c2ba1deb0a7720417716
2020-04-24 21:04:21 +00:00
fc138190e6
Merge "Add license type: BSD+Apache3+MIT+Boost = NOTICE" am: 6c84a6201a am: 862f8febb1 am: 68c68dca42 am: 78b814544d
...
Change-Id: Ib1b95f6043cd5b219f0fd844acd00d980a952a5f
2020-04-24 20:53:22 +00:00
78b814544d
Merge "Add license type: BSD+Apache3+MIT+Boost = NOTICE" am: 6c84a6201a am: 862f8febb1 am: 68c68dca42
...
Change-Id: I9f18663d341c149793e92e408b6affeb5442449a
2020-04-24 20:40:27 +00:00
68c68dca42
Merge "Add license type: BSD+Apache3+MIT+Boost = NOTICE" am: 6c84a6201a am: 862f8febb1
...
Change-Id: I851c7425b3ea693dd2ba5c48f3bccec31cbcee44
2020-04-24 20:30:31 +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
966a1b2ad9
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 66a1e930d1 -s ours am: 2a8a8833e2 am: 1a41ff0fa2 am: 18cbea3c0a -s ours
...
am skip reason: subject contains skip directive
Change-Id: I77a241c9b63a5b2241dbddc0780b095827df2d00
2020-04-10 04:43:55 +00:00
18cbea3c0a
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 66a1e930d1 -s ours am: 2a8a8833e2 am: 1a41ff0fa2
...
Change-Id: I0c40b28961ebeea85d9f25228b1d62d17269ac08
2020-04-10 04:08:05 +00:00
1a41ff0fa2
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 66a1e930d1 -s ours am: 2a8a8833e2
...
Change-Id: I59e6436f7fac67569ad5bcacd17dfefaa88a2d06
2020-04-10 03:36:52 +00:00
2a8a8833e2
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 66a1e930d1 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I768d83c1831d91af26843f4c9a6429f1d915c8c9
2020-04-10 03:12:47 +00: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
e928ecdf42
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: b6b0f3ddbb -s ours am: c639f40296 am: 979465a67a am: 9ff6af97e7 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I050dfdd4fea52b99a8235f5d514cdee7830f2c91
2020-03-19 07:11:44 +00:00
9ff6af97e7
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: b6b0f3ddbb -s ours am: c639f40296 am: 979465a67a
...
Change-Id: Ic926ca6eac43634d0a03abb3f83720681d00a2a0
2020-03-19 06:52:42 +00:00
979465a67a
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: b6b0f3ddbb -s ours am: c639f40296
...
Change-Id: I85da1eea58dc11feeee46368757b7719c7b1bb6c
2020-03-19 06:27:42 +00: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
c639f40296
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: b6b0f3ddbb -s ours
...
am skip reason: subject contains skip directive
Change-Id: I2edad8c20111c7f2117262d438d0482824976a03
2020-03-19 06:01:23 +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
53a8c7af4f
Merge "Remove mips workaround." am: 7856f35ede am: 4d875b4d48 am: 81f712fda0 am: 4a60ddbeed am: 7ef6833bc7
...
Change-Id: I865ab5c471b4b76da246c05aca34297928e2e7b2
2020-03-07 19:37:18 +00:00
7ef6833bc7
Merge "Remove mips workaround." am: 7856f35ede am: 4d875b4d48 am: 81f712fda0 am: 4a60ddbeed
...
Change-Id: I7502018071a5a17005ef5a736214bf9de1c25445
2020-03-07 19:24:14 +00:00
4a60ddbeed
Merge "Remove mips workaround." am: 7856f35ede am: 4d875b4d48 am: 81f712fda0
...
Change-Id: Id5372d3d210d4d061276c6c85ac26ea16e2086ee
2020-03-07 19:11:01 +00:00
f81791c3b6
Merge "Remove mips workaround." am: 7856f35ede am: 4d875b4d48
...
Change-Id: Ic81b2e27d6bcc1c6e2b3cb2c273f6363742f0d51
2020-03-07 18:58:33 +00:00
81f712fda0
Merge "Remove mips workaround." am: 7856f35ede am: 4d875b4d48
...
Change-Id: Ie946e8ab1bea23ed8d50645fe0fc6e2bc1b22569
2020-03-07 18:58:12 +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
661e84967b
Reland: Rework platform version to hide codenames.
...
The public platform version no longer can be a codename, it is
always the most recently released platform. A new build property
and API provides either the offical version or the current codename
as appropriate. This will avoid breaking apps that look at the
platform version while development is under a codename.
Bug: 143175463
Change-Id: I5b3d8913d4e96269f98e16917f4a02eb4b8e7d78
Test: manual
2020-02-06 11:22:45 +00:00
113b0f85e0
Revert submission
...
Reason for revert: This causes a boot issue on Taimen (b/144480969). It wasn't caught by TreeHugger due to Taimen tests being disabled due to a different lab outage (b/144350336).
Change-Id: I6510d4dba639429e74753711a21fe85c6b01bef2
2019-11-14 20:06:50 +00:00
e1d6569106
Rework platform version to hide codenames.
...
The public platform version no longer can be a codename, it is
always the most recently released platform. A new build property
and API provides either the offical version or the current codename
as appropriate. This will avoid breaking apps that look at the
platform version while development is under a codename.
Bug: 143175463
Test: manual
Change-Id: I8dec42edf5a4a6184156643c91073e33936fae56
2019-10-28 16:34:02 -07: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
