Kyle Alexander
b58de75756
DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours
...
am: e525aad042
2015-12-18 20:40:32 +00:00
Kyle Alexander
e525aad042
DO NOT MERGE ANYWHERE Update license tests to use Widevine license service
...
am: 99941b86b6
2015-12-18 20:38:36 +00:00
Kyle Alexander
99941b86b6
DO NOT MERGE ANYWHERE Update license tests to use Widevine license service
...
Based from Widevine cl:
https://widevine-internal-review.googlesource.com/#/c/16322/
Bug: 26046529
Change-Id: Ib8a4fd1588de35a02973bca1914a298a62a71f7c
2015-12-15 17:46:18 +00:00
Edwin Wong
de6d223b82
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc am: 2253f6c392
...
am: 10b2b36a1e
2015-10-20 04:26:42 +00:00
Edwin Wong
10b2b36a1e
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc
...
am: 2253f6c392
2015-10-20 04:24:53 +00:00
Edwin Wong
fc1240bdc2
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0
...
am: ac1854b989
2015-10-20 04:24:53 +00:00
Edwin Wong
2253f6c392
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68
...
am: 1afb1066cc
2015-10-20 04:23:06 +00:00
Edwin Wong
ac1854b989
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d
...
am: 2ee45a97b0
2015-10-20 04:23:06 +00:00
Edwin Wong
2ee45a97b0
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1
...
am: d5a1d5d58d
2015-10-20 04:21:24 +00:00
Edwin Wong
1afb1066cc
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905
...
am: ee415b7b68
2015-10-20 04:14:58 +00:00
Edwin Wong
d5a1d5d58d
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71
...
am: 5754438dc1
2015-10-20 04:13:17 +00:00
Edwin Wong
ee415b7b68
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968
...
am: 94dab9e905
2015-10-20 04:13:17 +00:00
Edwin Wong
5754438dc1
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e
...
am: 9617db4d71
2015-10-20 04:11:35 +00:00
Edwin Wong
94dab9e905
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03
...
am: 655574d968
2015-10-20 04:11:35 +00:00
Edwin Wong
655574d968
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d
...
am: 27133e7a03
2015-10-20 04:08:24 +00:00
Edwin Wong
9617db4d71
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev.
...
am: f78b0e780e
2015-10-20 04:08:23 +00:00
Edwin Wong
f78b0e780e
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev.
...
Change-Id: I3a89161de0bf84fc6257338a3e932b90feba3f82
2015-10-19 20:59:36 -07:00
Edwin Wong
27133e7a03
resolve merge conflicts of fea63b4062 to jb-mr1-dev.
...
am: f7c043f32d
2015-10-20 02:59:35 +00:00
Edwin Wong
c0b8030851
resolve merge conflicts of 769288d009 to jb-mr1.1-docs.
...
Change-Id: I26df84f2907bcd18a2646bec0fbe53d9624e5a9b
2015-10-19 18:32:07 -07:00
Edwin Wong
f7c043f32d
resolve merge conflicts of fea63b4062 to jb-mr1-dev.
...
Change-Id: Ia5dd0316bb057dbc2e185f720d194548d2a370a6
2015-10-19 18:22:48 -07:00
Jeff Tinker
c144724132
am 693f0813: am 87922237: DO NOT MERGE Part of fix for libmedia OOB write anywhere
...
* commit '693f0813814b10bfd23bea578fa258255477b207':
DO NOT MERGE Part of fix for libmedia OOB write anywhere
2015-08-21 15:36:22 +00:00
Jeff Tinker
693f081381
am 87922237: DO NOT MERGE Part of fix for libmedia OOB write anywhere
...
* commit '87922237de893b92c7b4d252999dd91d04470bd0':
DO NOT MERGE Part of fix for libmedia OOB write anywhere
2015-08-21 15:28:57 +00:00
Jeff Tinker
87922237de
DO NOT MERGE Part of fix for libmedia OOB write anywhere
...
Prevent usage of client provided address on
non-secure devices spoofed as being secure.
b/23223325
merge of go/wvgerrit/15420 from widevine repo
Change-Id: I1d4f3a652b3d5e78fca508f92005cfa8df5ec6db
2015-08-20 14:49:43 -07:00
Edwin Wong
fea63b4062
am 1e4bfd6f: Update Widevine Classic Library to 601_AndroidOS_J.7809 **** DO NOT MERGE ****
...
* commit '1e4bfd6f593877467514657c065e897b49db8a75':
Update Widevine Classic Library to 601_AndroidOS_J.7809 **** DO NOT MERGE ****
2014-08-25 18:28:46 +00:00
Edwin Wong
769288d009
Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
...
Add reference to openssl-0.9.8za submodule.
https://widevine-internal-review.googlesource.com/#/c/10863/
Update openssl lib to 0.9.8za.
https://widevine-internal-review.googlesource.com/#/c/10864/
bug: 15932110
Change-Id: Ibdeccd4de9625b6bbb57e5b8c35deb9f51a2b65d
2014-08-20 16:39:49 -07:00
Edwin Wong
1e4bfd6f59
Update Widevine Classic Library to 601_AndroidOS_J.7809 **** DO NOT MERGE ****
...
The toolchains that built the previous x86 libraries are no longer available.
Attempt to patch the tools was unsuccessful and the output will be greatly different
from previous build, and we do not have any jb-dev x86 devices in house for testing.
The x86 libraries were a special build for specific vendors. Therefore, the x86
libraries will not be updated in this CL.
The arm libraries were built using the same toolchains and svn revision as the previous
version, with updated Jam files pointing to openssl-0.9.8za.
Add reference to openssl-0.9.8za submodule.
https://widevine-internal-review.googlesource.com/#/c/10863/
Update openssl lib to 0.9.8za.
https://widevine-internal-review.googlesource.com/#/c/10864/
bug: 15932110
Change-Id: I72ef476d8900418aae76e05eb9cb30154c911ede
2014-08-20 11:12:45 -07:00
Edwin Wong
e024bb545b
am 5b57acc1: am f22b9807: am 7fd92342: (-s ours) am abee817f: (-s ours) am bf68c586: am 15ef647c: Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
...
* commit '5b57acc12a7cef04666ed19ac6e96d2921813c85':
Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
2014-08-14 22:15:26 +00:00
Edwin Wong
5b57acc12a
am f22b9807: am 7fd92342: (-s ours) am abee817f: (-s ours) am bf68c586: am 15ef647c: Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
...
* commit 'f22b980716b187db673c0265acd73a1f315a374d':
Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
2014-08-14 22:10:59 +00:00
Edwin Wong
f22b980716
am 7fd92342: (-s ours) am abee817f: (-s ours) am bf68c586: am 15ef647c: Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
...
* commit '7fd923422615646d94f1fa7a6dbf5a8749531258':
Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
2014-08-14 22:06:19 +00:00
Edwin Wong
7fd9234226
am abee817f: (-s ours) am bf68c586: am 15ef647c: Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
...
* commit 'abee817fbffe335ddda3ecf7ef019ef2ef75c3f2':
Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
2014-08-14 21:52:37 +00:00
Edwin Wong
abee817fbf
am bf68c586: am 15ef647c: Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
...
* commit 'bf68c58666e1cab7f6ed384baaaf310c7db15800':
Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
2014-08-14 21:48:21 +00:00
Edwin Wong
bf68c58666
am 15ef647c: Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
...
* commit '15ef647c317cabe84c73b1f05c7f5fc45f383462':
Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
2014-08-14 21:44:07 +00:00
Edwin Wong
5cf6ceea61
am 778f0d81: am 91a5fce4: am 9b787415: (-s ours) Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
...
* commit '778f0d814724da5fda04353a38cc879cf56c503a':
Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
2014-08-09 00:17:40 +00:00
Edwin Wong
778f0d8147
am 91a5fce4: am 9b787415: (-s ours) Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
...
* commit '91a5fce49a212cb8b11f6d6bff8e812390135e57':
Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
2014-08-09 00:14:41 +00:00
Edwin Wong
91a5fce49a
am 9b787415: (-s ours) Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
...
* commit '9b787415d9e56812b41abf460db18100092f5cf1':
Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
2014-08-09 00:11:06 +00:00
Edwin Wong
93df2f3e56
am b79dfd6f: am 00b7d578: Update Widevine Classic Library to 4.5.0.10124 **** DO NOT MERGE ****
...
* commit 'b79dfd6f9d5142cfb33d660db3afa22a67190867':
Update Widevine Classic Library to 4.5.0.10124 **** DO NOT MERGE ****
2014-08-09 00:05:00 +00:00
Edwin Wong
b79dfd6f9d
am 00b7d578: Update Widevine Classic Library to 4.5.0.10124 **** DO NOT MERGE ****
...
* commit '00b7d5781488224cd62a115a9ee844060bca5eef':
Update Widevine Classic Library to 4.5.0.10124 **** DO NOT MERGE ****
2014-08-09 00:02:07 +00:00
Edwin Wong
15ef647c31
Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
...
Add reference to openssl-0.9.8za submodule.
https://widevine-internal-review.googlesource.com/#/c/10863/
Update openssl lib to 0.9.8za.
https://widevine-internal-review.googlesource.com/#/c/10864/
bug: 15932110
Change-Id: Ida38800be568acce427e82e6df86044747c34a64
2014-08-08 15:42:36 -07:00
Edwin Wong
9b787415d9
Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
...
Add reference to openssl-0.9.8za submodule.
https://widevine-internal-review.googlesource.com/#/c/10863/
Update openssl lib to 0.9.8za.
https://widevine-internal-review.googlesource.com/#/c/10864/
bug: 15932110
Change-Id: Ia75295329b9ce6d43dd519feb032c0c5597b419a
2014-08-07 18:46:45 -07:00
Edwin Wong
00b7d57814
Update Widevine Classic Library to 4.5.0.10124 **** DO NOT MERGE ****
...
Add reference to openssl-0.9.8za submodule.
https://widevine-internal-review.googlesource.com/#/c/10860/
Update openssl lib to 0.9.8za.
https://widevine-internal-review.googlesource.com/#/c/10861/
Fix openssl build:
https://widevine-internal-review.googlesource.com/#/c/10865/
bug: 15932110
Change-Id: Iad0682bc686681d716b7976b95cd2b359185450c
2014-08-06 16:22:32 -07:00
Jeff Tinker
ccc0ebc470
am ec3cf9d1: am 54155e3d: am 9a9da0e0: Update license and content server URLs due to server migration.
...
* commit 'ec3cf9d12b77f118229f1994a0f84a6a346063ce':
Update license and content server URLs due to server migration.
2014-06-19 00:31:05 +00:00
Jeff Tinker
ec3cf9d12b
am 54155e3d: am 9a9da0e0: Update license and content server URLs due to server migration.
...
* commit '54155e3d6892280a84043effa67116851e9f86df':
Update license and content server URLs due to server migration.
2014-06-19 00:27:19 +00:00
Jeff Tinker
54155e3d68
am 9a9da0e0: Update license and content server URLs due to server migration.
...
* commit '9a9da0e040ee73fb38375e0a27be4e021d8887d5':
Update license and content server URLs due to server migration.
2014-06-19 00:23:09 +00:00
Jeff Tinker
9a9da0e040
Update license and content server URLs due to server migration.
...
Only affects OEM integration tests, not production code.
bug: 15600077
Change-Id: Id534cec663366f639d934baf8d366615a2d97b64
(cherry picked from commit a53677d27c
2014-06-17 11:46:37 -07:00
Edwin Wong
f6dd49f04a
am 9ba13504: am cf4cd549: am 1c68225d: am 50bfcfdb: am e8fbb466: am 8daed73e: am 4f962df0: am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
...
* commit '9ba13504396cc6a98e610894df8efb1f4fdc208f':
Fixed intermittent failure in GTS test.
2014-06-11 22:45:09 +00:00
Edwin Wong
9ba1350439
am cf4cd549: am 1c68225d: am 50bfcfdb: am e8fbb466: am 8daed73e: am 4f962df0: am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
...
* commit 'cf4cd54924ee8b157b97f24696613d9edbe26570':
Fixed intermittent failure in GTS test.
2014-06-11 22:40:34 +00:00
Edwin Wong
cf4cd54924
am 1c68225d: am 50bfcfdb: am e8fbb466: am 8daed73e: am 4f962df0: am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
...
* commit '1c68225dac88b0fe75b11a651613dc776f471ea8':
Fixed intermittent failure in GTS test.
2014-06-11 22:35:46 +00:00
Edwin Wong
1c68225dac
am 50bfcfdb: am e8fbb466: am 8daed73e: am 4f962df0: am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
...
* commit '50bfcfdbf8218fe878d5c135a27879d8977c5092':
Fixed intermittent failure in GTS test.
2014-06-11 22:25:08 +00:00
Edwin Wong
50bfcfdbf8
am e8fbb466: am 8daed73e: am 4f962df0: am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
...
* commit 'e8fbb466028620f216f6ae698835a0af848f888a':
Fixed intermittent failure in GTS test.
2014-06-11 22:21:20 +00:00
Edwin Wong
e8fbb46602
am 8daed73e: am 4f962df0: am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
...
* commit '8daed73ef7305c95abd28cd27c5bd13b3ae8b936':
Fixed intermittent failure in GTS test.
2014-06-11 22:19:12 +00:00
