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
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
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
9d6b1fe813
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
...
am: a095605674
Change-Id: I459fd3092be0bd325272eae31efa5ea616ef473a
2017-11-15 02:47:35 +00:00
a095605674
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
...
Change-Id: I2f688d32edc062ef5ddd5fe2afe9acfadfa3c73b
2017-11-14 16:38:15 -08:00
79615c5ad5
Merge commit 'd204c81fdce889de60ce69cfa5c3da1249dc8533' into HEAD
...
Change-Id: Idf8e115f8db81f5ec76553c405ba58f47d80c0f8
2017-11-13 14:35:31 -08:00
b3654bfbdd
Merge "Use -Werror in external/webrtc" am: 5768aa953f am: 0507baf9b1
...
am: 65f75275ee
Change-Id: I497bdbc8e44368985d5aa4a7005f7fa1d989bfc9
2017-10-27 00:28:39 +00:00
65f75275ee
Merge "Use -Werror in external/webrtc" am: 5768aa953f
...
am: 0507baf9b1
Change-Id: I7cb440b8f68e201966e25996091a9d1d1f6f073a
2017-10-27 00:20:22 +00:00
0507baf9b1
Merge "Use -Werror in external/webrtc"
...
am: 5768aa953f
Change-Id: Iae812431d1c34002e931e497f1b70cbf2f698ffa
2017-10-27 00:13:07 +00:00
5768aa953f
Merge "Use -Werror in external/webrtc"
2017-10-26 20:28:59 +00:00
7e09d5ac43
Use -Werror in external/webrtc
...
* Suppress existing missing-braces warning.
Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: I56af504b26843d0c9e6a56699f30996d8a1b74b8
2017-10-26 10:24:04 -07:00
4a6b87b09d
Merge "Add 'vendor: true' to headers to fix vndk builds" am: c333849418 am: 666817c7d1
...
am: 2f7f5be1df
Change-Id: I0606da5136a96ef7fd098f6197ed9906a09cf7e8
2017-10-26 07:44:52 +00:00
2f7f5be1df
Merge "Add 'vendor: true' to headers to fix vndk builds" am: c333849418
...
am: 666817c7d1
Change-Id: Ic02d71e88487502a1af99ade46329b68bf5f13dd
2017-10-26 07:42:51 +00:00
666817c7d1
Merge "Add 'vendor: true' to headers to fix vndk builds"
...
am: c333849418
Change-Id: I2a34f700a1735f2ae000b34ae137a96553ac367e
2017-10-26 07:40:50 +00:00
c333849418
Merge "Add 'vendor: true' to headers to fix vndk builds"
2017-10-26 07:37:40 +00:00
647707fec6
Add 'vendor: true' to headers to fix vndk builds
...
Test: lunch aosp_arm64_ab-eng; mmma external/webrtc
Change-Id: I39c4bde6811bcb7bd1970338c8429bc9564b0ea0
2017-10-26 00:35:01 -07:00
781e814fcb
Merge changes from topic "instruction_set_replace" am: e1ce5311ac am: ff3826d382
...
am: a3f42b7dc9
Change-Id: If979a9ee89e02cb5c2c79e93e54d7ec69c257bd9
2017-10-26 07:09:59 +00:00
9e250bed19
Remove WEBRTC_BUILD_NEON_LIBS am: aa415f46df am: d0febdf096
...
am: 353cd3b8aa
Change-Id: If557e90a04faec0c458110f1ba9892696de4d922
2017-10-26 07:09:50 +00:00
56ed19de4e
Include test makefile am: d526425f55 am: db2b8a8c69
...
am: 825d470d20
Change-Id: Ib5a3a405990202a37c46f8dca3dcb8d4239c7ff0
2017-10-26 07:09:42 +00:00
7dac89c0f5
Remove unused gnustl webrtc variants am: c3f927f4f5 am: cc3f37b54e
...
am: dcb7e9ea5c
Change-Id: I87240ad1d4d6545dc39f93b3082d24525c16fdf3
2017-10-26 07:09:32 +00:00
a3f42b7dc9
Merge changes from topic "instruction_set_replace" am: e1ce5311ac
...
am: ff3826d382
Change-Id: I0158667972232c59f10ca31e84ebc87973e54bc1
2017-10-26 07:05:48 +00:00
353cd3b8aa
Remove WEBRTC_BUILD_NEON_LIBS am: aa415f46df
...
am: d0febdf096
Change-Id: Idd524e65c7ecb3bc0bcc6b07c876d91e19d10ea3
2017-10-26 07:05:37 +00:00
825d470d20
Include test makefile am: d526425f55
...
am: db2b8a8c69
Change-Id: I1a5c6744c78841cf0edf26fc4a1b684e43e0d616
2017-10-26 07:05:32 +00:00
dcb7e9ea5c
Remove unused gnustl webrtc variants am: c3f927f4f5
...
am: cc3f37b54e
Change-Id: I9b3773f1ba4b86bb29002230f161fa59a6e1b993
2017-10-26 07:05:26 +00:00
ff3826d382
Merge changes from topic "instruction_set_replace"
...
am: e1ce5311ac
Change-Id: If7dcd81893e272465694656e955c1081bdc12457
2017-10-26 07:03:01 +00:00
d0febdf096
Remove WEBRTC_BUILD_NEON_LIBS
...
am: aa415f46df
Change-Id: I3fc2a088fcbae3f324320bdae46404bdfcd52b75
2017-10-26 07:02:49 +00:00
db2b8a8c69
Include test makefile
...
am: d526425f55
Change-Id: Icb8cd8f69bc975112ec2928cc713379bc4893eeb
2017-10-26 07:02:24 +00:00
cc3f37b54e
Remove unused gnustl webrtc variants
...
am: c3f927f4f5
Change-Id: I185117b455e7d2eb2cc32ab53a5d0dacd0f687af
2017-10-26 07:02:05 +00:00
e1ce5311ac
Merge changes from topic "instruction_set_replace"
...
* changes:
Convert to Android.bp
Remove WEBRTC_BUILD_NEON_LIBS
Include test makefile
Remove unused gnustl webrtc variants
2017-10-26 06:56:35 +00:00
7358fda399
Convert to Android.bp
...
See build/soong/README.md for more information.
Test: mmma external/webrtc
Change-Id: I821fe8af5da246c7d93c2caee2b7e262a2c0ef53
2017-10-25 15:20:25 -07:00
aa415f46df
Remove WEBRTC_BUILD_NEON_LIBS
...
It doesn't work, and only complicates the Soong conversion (since it
can't even be tested). It shouldn't be that hard to reimplement in Soong
if we ever fix it.
Test: mmma external/webrtc
Change-Id: Ia5a23a6b7fb1ee17f7d9633016eb8ff73435b448
2017-10-25 15:19:20 -07:00
d526425f55
Include test makefile
...
This wasn't being included by default, but it did build (so it would
have been usable with 'mm' manually). Instead just always include it.
Test: mmma external/webrtc
Change-Id: Ibab5eaa1a2fac7ea7605fc3bef605c4663e8cc82
2017-10-25 15:18:02 -07:00
c3f927f4f5
Remove unused gnustl webrtc variants
...
These aren't being used, and were complicating the makefiles.
Test: cs/webrtc gnustl
Change-Id: I256bc9da8e0dc89a11fda6a941a9cb43b8c0bb20
2017-10-25 15:17:01 -07:00
27e27fd000
Merge "Suppress non-critical warnings in webrtc." am: cd56b9ddae am: 60c71f62ea am: 3b894e682d am: ff04884918
...
am: d204c81fdc
Change-Id: Icf9338a11a263cbae1f2058ab44b5bd680ac9df0
2017-08-10 02:52:09 +00:00
d204c81fdc
Merge "Suppress non-critical warnings in webrtc." am: cd56b9ddae am: 60c71f62ea am: 3b894e682d
...
am: ff04884918
Change-Id: Ibe9a4e93f253a1c0654b9eda127baefa483ff912
2017-08-10 00:57:07 +00:00
ff04884918
Merge "Suppress non-critical warnings in webrtc." am: cd56b9ddae am: 60c71f62ea
...
am: 3b894e682d
Change-Id: I8ebc7ef377ce2240280eb518cbd4fdf7b2e4df90
2017-08-10 00:39:49 +00:00
3b894e682d
Merge "Suppress non-critical warnings in webrtc." am: cd56b9ddae
...
am: 60c71f62ea
Change-Id: I6428edfc933480ad45511ac30409e291538012f6
2017-08-10 00:36:50 +00:00
60c71f62ea
Merge "Suppress non-critical warnings in webrtc."
...
am: cd56b9ddae
Change-Id: I7b1ed3c35ee9adfec375979ef07bd0c62adc01a9
2017-08-10 00:33:17 +00:00
