Commit Graph

10688 Commits

Author SHA1 Message Date
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
cd56b9ddae Merge "Suppress non-critical warnings in webrtc." 2017-08-10 00:28:30 +00:00
107cb5291b Suppress non-critical warnings in webrtc.
* We should enable those warnings after fixing the upstream source code.

Bug: 64487164
Test: build with WITH_TIDY=1
Change-Id: I306b4eb26fc8729f21cab4d5b82c9e3b59d8db3e
2017-08-09 15:08:21 -07:00
f3767f2083 Merge "Move all libwebrtc* to vendor image. (2/2)" am: 3d524127ba am: 1bc667417d am: b94e759f1f
am: 4f42e5a3a4

Change-Id: I4102e875115058f082560ed5027175a2e9de3f2a
2017-07-14 23:35:16 +00:00
4f42e5a3a4 Merge "Move all libwebrtc* to vendor image. (2/2)" am: 3d524127ba am: 1bc667417d
am: b94e759f1f

Change-Id: I17a329ab16b4742d43badd9b07a602435192dfdb
2017-07-14 23:30:30 +00:00
b94e759f1f Merge "Move all libwebrtc* to vendor image. (2/2)" am: 3d524127ba
am: 1bc667417d

Change-Id: I267d1c20794ca91671dfc3aea8e3a1fd5caabc42
2017-07-14 23:27:08 +00:00
1bc667417d Merge "Move all libwebrtc* to vendor image. (2/2)"
am: 3d524127ba

Change-Id: Ief1ef735ecb67f9b80219eb65432851b4e85dc64
2017-07-14 23:21:32 +00:00
3d524127ba Merge "Move all libwebrtc* to vendor image. (2/2)" 2017-07-14 23:09:10 +00:00
e54a1ce2e6 Move all libwebrtc* to vendor image. (2/2)
Native tests are also moved.

Test: mma -j BOARD_VNDK_VERSION=current
Test: m -j -k BOARD_VNDK_VERSION=current has no errors for webrtc

Bug: 62489821
Change-Id: I7f182403c2dabafc20b53f1046f68c1af81cede2
2017-07-14 14:34:15 -07:00
93ba6cc352 Merge "libwebrtc_base depends on liblog" am: c07e6f5974 am: f08d623d4e am: e867596380 -s ours
am: 268fd96814  -s ours

Change-Id: I3618372d6abadbb1615496c4b38f0a482d1f72fb
2017-06-16 06:26:05 +00:00
7e039cbceb Merge "Move all libwebrtc* to vendor image." am: 12aeeac6a5 am: 83cb4ee1d7 am: bfb116c3ac -s ours
am: bb3ab55c49  -s ours

Change-Id: I27f4d32257d9c2c265837efef4d6f4a4b1a02860
2017-06-16 06:25:48 +00:00