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
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
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
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
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
Edwin Wong
8daed73ef7
am 4f962df0: am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
...
* commit '4f962df0b93564d3dbf62855279e2ea2ac4f1191':
Fixed intermittent failure in GTS test.
2014-06-11 22:15:56 +00:00
Edwin Wong
4f962df0b9
am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
...
* commit 'c1dee5d84735b41dfd92f956418b833e1842a2be':
Fixed intermittent failure in GTS test.
2014-06-11 22:12:24 +00:00
Edwin Wong
c1dee5d847
am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
...
* commit '35ebeec71f3f0d0b763f1ef8cf3b98bae2aeee2e':
Fixed intermittent failure in GTS test.
2014-06-11 22:08:36 +00:00
Edwin Wong
35ebeec71f
am f6ffee47: Fixed intermittent failure in GTS test.
...
* commit 'f6ffee472c33b85d21c820862c398406e1c964b5':
Fixed intermittent failure in GTS test.
2014-06-11 22:05:25 +00:00
Edwin Wong
f6ffee472c
Fixed intermittent failure in GTS test.
...
Need to clear mEncKey in constructor, otherwise, decrypted data is wrong.
bug: 15540382
Change-Id: I0e2d4d6edd8a5800fa2a36e9f258782edc493e13
2014-06-11 11:39:28 -07:00
Edwin Wong
8ca56c3f12
am 01403eff: am c9c20cc6: am 62d84540: am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
...
* commit '01403eff12109f2388d85971b5c17b67bd0c4925':
Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 18:08:40 +00:00
Edwin Wong
01403eff12
am c9c20cc6: am 62d84540: am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
...
* commit 'c9c20cc64803bf885746b3c9ebe6b8f19bff9bfd':
Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 18:05:17 +00:00
Edwin Wong
c9c20cc648
am 62d84540: am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
...
* commit '62d845404c0b5cfb5bb0e0e3f4fcd12970a5ba72':
Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 18:01:34 +00:00
Edwin Wong
62d845404c
am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
...
* commit '1825fda8fda9c5037cacc175f3d2ef1579fd7cb0':
Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 17:59:32 +00:00
Edwin Wong
1825fda8fd
am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
...
* commit '964494409f2ce720557eb617ef44caf9ac10c05d':
Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 17:56:16 +00:00
Edwin Wong
964494409f
Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
...
To make the information readily accessible for vendors who have signed the IDA
and to better sync the doc to our code base.
Access to /vendor/widevine is controlled and vendors need to sign the IDA.
bug: 14228621
Change-Id: I3aaa2574d99c0123cb5e0fe0f093763a973aefaf
2014-04-24 15:32:29 -07:00
John "Juce" Bruce
470fb26f72
am 071f6998: DO NOT MERGE - Update Widevine Classic on JB-MR1.1 to 4.5.0.10107
...
* commit '071f6998928ff2dbc0c5c3393f4ea9f0e6205ce9':
DO NOT MERGE - Update Widevine Classic on JB-MR1.1 to 4.5.0.10107
2013-10-01 15:17:45 -07:00
John "Juce" Bruce
071f699892
DO NOT MERGE - Update Widevine Classic on JB-MR1.1 to 4.5.0.10107
...
This updates the Widevine Classic libraries to version 4.5.0.10107.
This version backports the bugfix for the IPv6 issue from JB-MR2.
Also, the Widevine build system has been updated to support all six
flavors. (2 security levels x 3 instruction sets)
This change adds x86 L1 binaries and MIPS L3 binaries, as these have
been validated by partners.
Bug: 10246711
Change-Id: Ic0cf32ffd82fc8dacced84cecdee059afa1049ca
2013-10-01 15:12:21 -07:00
Fred Gylys-Colwell
fc913138ac
am 0b56285a: Update JBMR1 Widevine Libraries to 4.5.0.10095 (DO NOT MERGE)
...
* commit '0b56285a624338a87f7759f73faa0cda44b42cfa':
Update JBMR1 Widevine Libraries to 4.5.0.10095 (DO NOT MERGE)
2013-09-12 11:12:59 -07:00
Fred Gylys-Colwell
0b56285a62
Update JBMR1 Widevine Libraries to 4.5.0.10095 (DO NOT MERGE)
...
This change updates the Widevine binary libraries.
It includes the change:
Change name of DNS Server For Android Build
https://widevine-internal-review.googlesource.com/3322
Correct tool version for x86 jb-mr1 builds
https://widevine-internal-review.googlesource.com/3154
Update Build Script for Android
https://widevine-internal-review.googlesource.com/3340
Fixes to Jenkins build script for Android JBMR1 builds.
https://widevine-internal-review.googlesource.com/3551
Add Android property os.build.fingerprint to license request
https://widevine-internal-review.googlesource.com/3390
Bug: b/8173236
Bug: b/7594544 - Support x86 build on jbmr1
Bug: b/5425489
Change-Id: I6e32ab880c5768d724145d46a8b283bcdb2796ca
2013-06-24 21:17:43 +00:00
Rahul Frias
296ca2be0a
am 8f27e0d0: am 26606363: (-s ours) am 67e51538: (-s ours) Add Widevine jb-mr1 libraries for x86 (DO NOT MERGE)
...
* commit '8f27e0d0e10d348e676bd239f01f30428a930f1c':
Add Widevine jb-mr1 libraries for x86 (DO NOT MERGE)
2013-04-01 09:17:42 -07:00
Rahul Frias
8f27e0d0e1
am 26606363: (-s ours) am 67e51538: (-s ours) Add Widevine jb-mr1 libraries for x86 (DO NOT MERGE)
...
* commit '26606363cf6ce18c35c2682978913558cedf9b19':
Add Widevine jb-mr1 libraries for x86 (DO NOT MERGE)
2013-04-01 09:15:55 -07:00
Rahul Frias
26606363cf
am 67e51538: (-s ours) Add Widevine jb-mr1 libraries for x86 (DO NOT MERGE)
...
* commit '67e515380539f48063ab977792a0b25dcc37a26d':
Add Widevine jb-mr1 libraries for x86 (DO NOT MERGE)
2013-04-01 09:14:30 -07:00
Rahul Frias
8b99bc11f3
am f1cb05e6: Add Widevine jb-mr1 libraries for x86 (DO NOT MERGE)
...
* commit 'f1cb05e6b7dfe552ccd62160b74256c6aba2194d':
Add Widevine jb-mr1 libraries for x86 (DO NOT MERGE)
2013-04-01 09:14:27 -07:00
Rahul Frias
f1cb05e6b7
Add Widevine jb-mr1 libraries for x86 (DO NOT MERGE)
...
The widevine library version is 4.5.0.10095. This includes,
Correct tool version for x86 jb-mr1 builds
https://widevine-internal-review.googlesource.com/3154
Update Build Script for Android
https://widevine-internal-review.googlesource.com/3340
Fixes to Jenkins build script for Android JBMR1 builds.
https://widevine-internal-review.googlesource.com/3551
Add Android property os.build.fingerprint to license request
https://widevine-internal-review.googlesource.com/3390
b/7594544 - Support x86 build on jb-mr1
Change-Id: Ibb8c172cccf392be217952406fd25666deeaea57
2013-03-29 10:04:43 -07:00
Rahul Frias
67e5153805
Add Widevine jb-mr1 libraries for x86 (DO NOT MERGE)
...
The widevine library version is 4.5.0.10095. This includes,
Correct tool version for x86 jb-mr1 builds
https://widevine-internal-review.googlesource.com/3154
Update Build Script for Android
https://widevine-internal-review.googlesource.com/3340
Fixes to Jenkins build script for Android JBMR1 builds.
https://widevine-internal-review.googlesource.com/3551
Add Android property os.build.fingerprint to license request
https://widevine-internal-review.googlesource.com/3390
b/7594544 - Support x86 build on jb-mr1
Change-Id: I99f969470314c37359772de9471315dc5a6565cd
2013-03-29 09:51:12 -07:00
Jean-Baptiste Queru
52ab679198
am f2183676: am ac144954: (-s ours) am bdf5e473: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'f2183676ce5691a310ad4d6d1476731336cf37af':
[WVDRM] Fix effectively-unlimited memory usage
Revert "Update Widevine Libraries to Version 4.5.0.10079"
[DRM] Widevine library update 4.5.0-7809 DO NOT MERGE
2013-03-11 12:56:11 -07:00
Jean-Baptiste Queru
f2183676ce
am ac144954: (-s ours) am bdf5e473: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'ac14495401e29b7d94dd6888b542167416304eb1':
[WVDRM] Fix effectively-unlimited memory usage
Revert "Update Widevine Libraries to Version 4.5.0.10079"
[DRM] Widevine library update 4.5.0-7809 DO NOT MERGE
2013-03-11 12:47:36 -07:00
Jean-Baptiste Queru
ac14495401
am bdf5e473: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'bdf5e4739128603632f5ca4804eee7ba4ecf4da9':
[WVDRM] Fix effectively-unlimited memory usage
Revert "Update Widevine Libraries to Version 4.5.0.10079"
[DRM] Widevine library update 4.5.0-7809 DO NOT MERGE
2013-03-11 12:37:34 -07:00
Jean-Baptiste Queru
bdf5e47391
Reconcile with jb-mr1-release - do not merge
2013-03-11 12:28:39 -07:00
Fred Gylys-Colwell
ec68306390
am 7bd6a810: Merge "Update Widevine Libraries Version 4.5.0.10088" into jb-mr1.1-dev
...
* commit '7bd6a81067afe45ff26c630c440a138da0fb73f5':
Update Widevine Libraries Version 4.5.0.10088
2012-11-27 17:13:18 -08:00
Fred Gylys-Colwell
7bd6a81067
Merge "Update Widevine Libraries Version 4.5.0.10088" into jb-mr1.1-dev
2012-11-27 17:10:55 -08:00
Edwin Wong
7142b3d60c
am d0c2e46e: am 63f5ec89: (-s ours) am 583b50d5: Widevine library Version 4.5.0.1 AES 601_AndroidOS_J_MR0; DO NOT MERGE
...
* commit 'd0c2e46e423b2586049f39dd295b9b725277a0fb':
Widevine library Version 4.5.0.1 AES 601_AndroidOS_J_MR0; DO NOT MERGE
2012-11-16 10:04:05 -08:00
Edwin Wong
d0c2e46e42
am 63f5ec89: (-s ours) am 583b50d5: Widevine library Version 4.5.0.1 AES 601_AndroidOS_J_MR0; DO NOT MERGE
...
* commit '63f5ec89537598b885a88b9e74d8ef2029159005':
Widevine library Version 4.5.0.1 AES 601_AndroidOS_J_MR0; DO NOT MERGE
2012-11-16 10:00:20 -08:00
Edwin Wong
63f5ec8953
am 583b50d5: Widevine library Version 4.5.0.1 AES 601_AndroidOS_J_MR0; DO NOT MERGE
...
* commit '583b50d5d3a87c48d42b3d604ea7cadc1b0102be':
Widevine library Version 4.5.0.1 AES 601_AndroidOS_J_MR0; DO NOT MERGE
2012-11-16 09:57:46 -08:00
Edwin Wong
583b50d5d3
Widevine library Version 4.5.0.1 AES 601_AndroidOS_J_MR0; DO NOT MERGE
...
Initial library release for Intel Medfield x86 SOC
Change-Id: I4a8e5f98fb46e19a664602dd3d406df774103956
related-to-bug: 6842444
2012-11-15 14:51:13 -08:00
Fred Gylys-Colwell
9477a252d3
Update Widevine Libraries Version 4.5.0.10088
...
This change updates the Widevine binary libraries.
It includes the change:
Turn on IPv6 Compatibility.
https://widevine-internal-review.googlesource.com/2242
bug: 7471810
Change-Id: I09beacb7853435f21c263e226a3dcaff74afbd2b
2012-11-09 12:50:44 -08:00
The Android Automerger
536517cfa7
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-23 23:36:27 -07:00
Jeff Tinker
7fc32e3dab
am aac68688: Update Widevine Libraries Version 4.5.0.10087
...
* commit 'aac68688307d476cc7c607766a8afa644bd95905':
Update Widevine Libraries Version 4.5.0.10087
2012-10-23 21:41:03 -07:00
Jeff Tinker
aac6868830
Update Widevine Libraries Version 4.5.0.10087
...
This change updates the Widevine binary libraries.
It includes the change:
Correct error returned by ProcessDrmInfo
https://widevine-internal-review.googlesource.com/#/c/1870/
bug:7320744
Change-Id: Ic73a5dfa70140093224e9ce651947b224bdeccb9
2012-10-23 12:33:51 -07:00
Fred Gylys-Colwell
8584706e03
am 607d9110: am f4ca146c: (-s ours) am 87fa1829: Revert "Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE)"
...
* commit '607d91108f38b9603a3a93200c21354d3315687b':
Revert "Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE)"
2012-10-05 13:57:07 -07:00
Fred Gylys-Colwell
607d91108f
am f4ca146c: (-s ours) am 87fa1829: Revert "Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE)"
...
* commit 'f4ca146ca9d0c388b83c083ad6dd1c8fef81231f':
Revert "Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE)"
2012-10-05 13:54:55 -07:00
