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
bb3ab55c49
Merge "Move all libwebrtc* to vendor image." am: 12aeeac6a5 am: 83cb4ee1d7
...
am: bfb116c3ac -s ours
Change-Id: I8e1c707693b4d91a19f80a19d00578c0708b9def
2017-06-16 06:21:47 +00:00
bfb116c3ac
Merge "Move all libwebrtc* to vendor image." am: 12aeeac6a5
...
am: 83cb4ee1d7
Change-Id: Ia8eae124a9a4a6d13740f8ceb4d32198dbfbb296
2017-06-16 06:17:17 +00:00
83cb4ee1d7
Merge "Move all libwebrtc* to vendor image."
...
am: 12aeeac6a5
Change-Id: Ica8d1cb32c6de32362df481cfee4dc061bd16f9f
2017-06-16 06:13:16 +00:00
12aeeac6a5
Merge "Move all libwebrtc* to vendor image."
2017-06-16 06:05:02 +00:00
11d9a8be40
Move all libwebrtc* to vendor image.
...
Native tests are not moved. Tests include:
webrtc_apm_process_test
webrtc_isac_test
webrtc_apm_unit_test
Test: mma -j
Test: m -j -k BOARD_VNDK_VERSION=current has no errors for webrtc
Bug: 62489821
Merged-In: I013303de263866cbf368f3f89327c5357f9cecdb
Change-Id: I013303de263866cbf368f3f89327c5357f9cecdb
(cherry picked from commit 8df7e85368569b7cd0afc1ce231b8b3a0ab49333)
2017-06-14 19:37:33 +09:00
0add8d1928
libwebrtc_base depends on liblog am: c6f833ab1a
...
am: 87bd738c87
Change-Id: Ic5a4a491b06f6c3248efede62719ca19f06a905c
2017-06-12 17:49:48 +00:00
9877c80c71
Move all libwebrtc* to vendor image. am: 8df7e85368
...
am: f7c82f3b00
Change-Id: I35a0c3523926b6cfde832f9dd12a50c0fd2a410a
2017-06-12 17:49:45 +00:00
87bd738c87
libwebrtc_base depends on liblog
...
am: c6f833ab1a
Change-Id: I697b598bd1206f16e682021c04e1314860bb327b
2017-06-12 17:44:13 +00:00
f7c82f3b00
Move all libwebrtc* to vendor image.
...
am: 8df7e85368
Change-Id: I7f5ad0451aa73ab7e86d13f853ce373fd3d1b771
2017-06-12 17:44:07 +00:00
c6f833ab1a
libwebrtc_base depends on liblog
...
Fix a missing dependency.
Test: mma -j
Test: m -j -k BOARD_VNDK_VERSION=current has no error for webrtc
Bug: 62489821
Change-Id: I479a4addb59b42dd86cc5dfa02cd4ff6d1b6d626
2017-06-09 15:49:35 -07:00
8df7e85368
Move all libwebrtc* to vendor image.
...
Native tests are not moved. Tests include:
webrtc_apm_process_test
webrtc_isac_test
webrtc_apm_unit_test
Test: mma -j
Test: m -j -k BOARD_VNDK_VERSION=current has no errors for webrtc
Bug: 62489821
Change-Id: I013303de263866cbf368f3f89327c5357f9cecdb
2017-06-09 15:49:34 -07:00
fe330390f0
Merge "Use SSL_CTX_set_max_proto_version instead of SSL_CTX_set_max_version." am: 0d85cc3c3c am: 1335ab5cae am: c0c6db4af3
...
am: 76c221cc32
Change-Id: Ia028017fece6983d19b0f3750c459f0787cb7e44
2017-04-24 19:44:59 +00:00
76c221cc32
Merge "Use SSL_CTX_set_max_proto_version instead of SSL_CTX_set_max_version." am: 0d85cc3c3c am: 1335ab5cae
...
am: c0c6db4af3
Change-Id: Ie40178c8e1e8c2c9e13401142a202d9c61e8cbc1
2017-04-24 19:22:24 +00:00
c0c6db4af3
Merge "Use SSL_CTX_set_max_proto_version instead of SSL_CTX_set_max_version." am: 0d85cc3c3c
...
am: 1335ab5cae
Change-Id: I9ef346f9718c83ce8bc715e12d4a69fa2cd2dfed
2017-04-24 19:18:13 +00:00
1335ab5cae
Merge "Use SSL_CTX_set_max_proto_version instead of SSL_CTX_set_max_version."
...
am: 0d85cc3c3c
Change-Id: I797c6180590a2b320a62553f74a46889662a4ba1
2017-04-24 19:10:26 +00:00
0d85cc3c3c
Merge "Use SSL_CTX_set_max_proto_version instead of SSL_CTX_set_max_version."
2017-04-24 19:06:15 +00:00
458ffd574b
Use SSL_CTX_set_max_proto_version instead of SSL_CTX_set_max_version.
...
These functions are identical. BoringSSL added these APIs, then OpenSSL
1.1.0 added similar ones but with slightly longer names. We're
standardizing on the OpenSSL names to avoid API skew.
This is a cherry-pick of https://codereview.webrtc.org/2550423004 .
Test: mma
Change-Id: Iffe4416bd300d71bbaa94c7c127ae89d6286cd7b
2017-04-21 19:47:12 -04:00
5ce6da7cd4
Merge "webrtc: Use the NDK cpufeatures directly" am: 6d99081fdd am: d70176e5a0 am: 564d8d32cb
...
am: c1c39a894a
Change-Id: I2ad64f7d0164bd0dd4a14e37aee8695d87c1c425
2017-04-18 22:42:43 +00:00
c1c39a894a
Merge "webrtc: Use the NDK cpufeatures directly" am: 6d99081fdd am: d70176e5a0
...
am: 564d8d32cb
Change-Id: Ic722d6421a581dc727d3f376a10a282091e3a197
2017-04-18 22:20:02 +00:00
564d8d32cb
Merge "webrtc: Use the NDK cpufeatures directly" am: 6d99081fdd
...
am: d70176e5a0
Change-Id: I265ffb76c318073da0f67f5104c60485cbca35be
2017-04-18 22:10:00 +00:00
d70176e5a0
Merge "webrtc: Use the NDK cpufeatures directly"
...
am: 6d99081fdd
Change-Id: I7db6d0f32b0f0696f3587f7a0e05a8334f10e301
2017-04-18 22:00:23 +00:00
6d99081fdd
Merge "webrtc: Use the NDK cpufeatures directly"
2017-04-18 19:56:44 +00:00
83d672966a
webrtc: Use the NDK cpufeatures directly
...
* Modeled after Elliott Hughes' commit here: I82fb692c758d4855efa12ca7b743ce2893776a77
* Allows for compatibility with ARMv8
Test: mm
Change-Id: Ic80b0ff9416c781efed1b9686b6dff077c75e673
2017-04-11 18:58:33 -04:00
9306ff459c
Merge "Leave only an empty top level OWNERS file." am: 82eac3519a am: 4cc6c9fa1f
...
am: d1d58ca589
Change-Id: Ib8e42e572f0c64557b4412b18584260be647f55f
2017-02-24 22:14:25 +00:00
d1d58ca589
Merge "Leave only an empty top level OWNERS file." am: 82eac3519a
...
am: 4cc6c9fa1f
Change-Id: If756c1d35d4cfe12c24a09cedd73b5ca009c2fb5
2017-02-24 22:11:55 +00:00
4cc6c9fa1f
Merge "Leave only an empty top level OWNERS file."
...
am: 82eac3519a
Change-Id: Ief7d3570c88e66d7be19dd4eee8a3bab2e39899d
2017-02-24 22:09:24 +00:00
82eac3519a
Merge "Leave only an empty top level OWNERS file."
2017-02-24 22:04:48 +00:00
2622ea73e3
Leave only an empty top level OWNERS file.
...
We should not copy OWNERS files from upstream,
or the owners should be registered in Gerrit Code Review.
Bug: 33166666
Test: default build targets
Change-Id: Ibfd47e643f03678bb65880653383adb84809169d
2017-02-23 22:25:35 -08:00
f81b461771
Fix build warnings
...
Test: builds without warnings
Change-Id: Ic88c90167584c97689ac32e0c03d692560e14570
2017-01-12 09:19:37 -08:00
3accb2262d
Merge "Use arch-specific variables" am: b33ba455c4 am: 3f1ab425f5
...
am: c55415d27b
Change-Id: Ia1b9be2f0ccc56ead8f3efb35f11a667abc80d2f
2016-10-19 20:08:59 +00:00
c55415d27b
Merge "Use arch-specific variables" am: b33ba455c4
...
am: 3f1ab425f5
Change-Id: I3dd1a638a4cfa377f398d90bd9896f2d1f03b813
2016-10-19 19:52:04 +00:00
3f1ab425f5
Merge "Use arch-specific variables"
...
am: b33ba455c4
Change-Id: I9d47a4379da6c4c88c0847c8fca6d4a2c799ca15
2016-10-19 19:45:31 +00:00
b33ba455c4
Merge "Use arch-specific variables"
2016-10-19 19:36:24 +00:00
33d86be80e
Use arch-specific variables
...
This fixes x86+arm multilib build.
Bug: 27526885
Test: Build system refactoring CL. Existing unit tests still pass.
Change-Id: I7290198a3671af3688cf125ffb1e6979344c0a8d
2016-10-18 20:57:44 +02:00
2c7ba826b3
Fix build warnings
...
Test: builds frameworks/av with no warnings
Change-Id: I9efb1c6d532a8be5742e5b16a4787a7e536f00cf
2016-10-09 10:05:30 -07:00
84bc2b9bf3
Merge \\\\"Remove useless static linking\\\\" am: 0f2acd7beb am: 8b409f342d am: 0c90af9153
...
am: d06cfc8742
Change-Id: I07adba800bb564b8d53c4770269b85e659beffaf
2016-06-16 16:17:42 +00:00
d06cfc8742
Merge \\\"Remove useless static linking\\\" am: 0f2acd7beb am: 8b409f342d
...
am: 0c90af9153
Change-Id: I640e45cb32c88c9b31c46fa6bb019a835d21c953
2016-06-16 16:15:04 +00:00
0c90af9153
Merge \\"Remove useless static linking\\" am: 0f2acd7beb
...
am: 8b409f342d
Change-Id: I2ca3f4b3a3b06e90cd1d4c9531adbcd33eb6020b
2016-06-16 16:12:31 +00:00
8b409f342d
Merge \"Remove useless static linking\"
...
am: 0f2acd7beb
Change-Id: I8f758d065ce564bb6dd1e219ab1cf29776ea24d0
2016-06-16 16:11:05 +00:00
0f2acd7beb
Merge "Remove useless static linking"
2016-06-16 15:58:21 +00:00
33b02a2a71
Remove useless static linking
...
LOCAL_STATIC_LIBRARIES in a BUILD_STATIC_LIBRARY only imports C include
directories, it doesn't actually do any linking. Since this module is
building against the NDK, it shouldn't be referencing modules not built
against the NDK, like libprotobuf-cpp-lite. There are versions of that
library that may be more appropriate, but since there aren't any source
files, we don't need the include directories, so remove it entirely.
Change-Id: I47f7333228bea43979ce86c4bd23f4b2a92b49ce
2016-06-15 23:07:02 -07:00
410d78766d
Merge commit \'a4acd9d6bc9b3b033d7d274316e75ee067df8d20\' into HEAD
...
am: 19b0dfaa7b
* commit '19b0dfaa7b027ac9197f122228374644352837e0':
2016-02-17 20:48:19 +00:00
19b0dfaa7b
Merge commit 'a4acd9d6bc9b3b033d7d274316e75ee067df8d20' into HEAD
2016-02-17 09:50:41 -08:00
eca42429bd
Merge "Add missing liblog dependency"
...
am: 6dc914a60e
* commit '6dc914a60e74da53c9586e60a4e5e82a542e2393':
Add missing liblog dependency
2016-02-13 01:46:01 +00:00
6dc914a60e
Merge "Add missing liblog dependency"
2016-02-13 01:30:36 +00:00
9ea1ad11db
Add missing liblog dependency
...
Bug: http://b/27171986
Change-Id: Icdc4f8ce21b0aa51b651042b9f58bd88808066df
2016-02-12 16:34:56 -08:00
4805e8260a
Merge "Suppress unused-parameter warnings."
...
am: 14a01a403a
* commit '14a01a403a3a03350623687a5a5ca1e64a985224':
Suppress unused-parameter warnings.
2016-02-12 02:56:10 +00:00
14a01a403a
Merge "Suppress unused-parameter warnings."
2016-02-12 02:44:17 +00:00
4e188dd374
Suppress unused-parameter warnings.
...
Suppress warnings until upstream can fix them.
BUG: 27074506
Change-Id: If7e6f190100fba025d25d2634d1c9a657cc24854
2016-02-11 16:11:43 -08:00