Ying Wang
fafe5ac819
Merge "Signapk.java: hide the password"
2015-03-11 16:46:00 +00:00
Mohamad Ayyash
29a0178993
am 9b19382f
: resolved conflicts for merge of fc759204
to stage-aosp-master
...
* commit '9b19382f0e55be199da4b3f604fc114aba8fb2fc':
Allow flashing a squashfs system image
2015-03-05 00:01:46 +00:00
Mohamad Ayyash
9b19382f0e
resolved conflicts for merge of fc759204
to stage-aosp-master
...
Change-Id: Icf58e881286a66cb3ca4cb122fa8c11ec217fbab
2015-03-04 15:43:45 -08:00
Mohamad Ayyash
b97746ef09
Allow flashing a squashfs system image
...
Change-Id: Ic51d11274784a8d2e9d57d5f0b821ebc89680e5a
Signed-off-by: Mohamad Ayyash <mkayyash@google.com >
2015-03-03 18:54:50 -08:00
Mohamad Ayyash
73f17f0f76
Merge "Allow flashing a squashfs system image"
2015-03-04 00:42:12 +00:00
Mohamad Ayyash
6894695819
Allow flashing a squashfs system image
...
Change-Id: Ic51d11274784a8d2e9d57d5f0b821ebc89680e5a
Signed-off-by: Mohamad Ayyash <mkayyash@google.com >
2015-03-03 15:14:37 -08:00
Jesse Zhao
7ca20d1a1c
Fix the error that free_string is not defined.
...
Change-Id: I7490a91ea930daaf194dad0c8b3a3357558b4770
Bug:19573713
2015-03-02 17:21:38 -08:00
Narayan Kamath
0cb10289e7
am de979a02
: am 2479a098
: am 30b5ed7b
: Merge "Fix zipalign README file and usage strings."
...
* commit 'de979a0205ee181d20c7cb65a7112eac1c570498':
Fix zipalign README file and usage strings.
2015-02-27 17:43:01 +00:00
Narayan Kamath
de979a0205
am 2479a098
: am 30b5ed7b
: Merge "Fix zipalign README file and usage strings."
...
* commit '2479a0987da03f0059c42991bf59e3b32551e107':
Fix zipalign README file and usage strings.
2015-02-27 17:35:57 +00:00
Narayan Kamath
2479a0987d
am 30b5ed7b
: Merge "Fix zipalign README file and usage strings."
...
* commit '30b5ed7b1e8c67c816d64ad1b7c9bde3c3b5019c':
Fix zipalign README file and usage strings.
2015-02-27 17:26:49 +00:00
Ryosuke Matsuuchi
b5fa03960c
am 41d35af2
: am 3e7688d0
: am 3c242c5d
: am 4b2537f3
: am e34b4ec4
: am 2b486dc8
: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
...
* commit '41d35af217004a51c2ac5c2adebdb67a18a25fc2':
doc: Add Japanese version of DAC/distribute/ page.
2015-02-27 17:08:57 +00:00
Ryosuke Matsuuchi
41d35af217
am 3e7688d0
: am 3c242c5d
: am 4b2537f3
: am e34b4ec4
: am 2b486dc8
: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
...
* commit '3e7688d0415af5cb805f3ece39fec4303eb834a9':
doc: Add Japanese version of DAC/distribute/ page.
2015-02-27 17:03:18 +00:00
Ryosuke Matsuuchi
3c242c5ddb
am 4b2537f3
: am e34b4ec4
: am 2b486dc8
: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
...
* commit '4b2537f39d7ac29258908e1a38ebdf085fd44c5f':
doc: Add Japanese version of DAC/distribute/ page.
2015-02-27 16:42:54 +00:00
Ryosuke Matsuuchi
4b2537f39d
am e34b4ec4
: am 2b486dc8
: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
...
* commit 'e34b4ec484faf5dac8286bb17bedeed0e83a6962':
doc: Add Japanese version of DAC/distribute/ page.
2015-02-27 16:38:38 +00:00
Narayan Kamath
e0b8d19f31
Fix zipalign README file and usage strings.
...
Addresses comments from change 13e5965306
.
Change-Id: I0a2c0048781858d3aa06347a77220547cfcdcebe
2015-02-27 14:17:17 +00:00
Ryosuke Matsuuchi
2b486dc8c3
Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
2015-02-27 07:58:58 +00:00
Narayan Kamath
7a9e388405
am 738871f6
: am e886392c
: am 37a44faa
: Merge "Store native libs aligned to PAGE_SIZE"
...
* commit '738871f6eb3c372b60928e761f0dc24e46a6bba5':
Store native libs aligned to PAGE_SIZE
2015-02-26 12:58:11 +00:00
Narayan Kamath
e886392c37
am 37a44faa
: Merge "Store native libs aligned to PAGE_SIZE"
...
* commit '37a44faa7266c8a7e0cc5077a4c028d6f5bfa7f7':
Store native libs aligned to PAGE_SIZE
2015-02-26 12:45:34 +00:00
Dmitriy Ivanov
13e5965306
Store native libs aligned to PAGE_SIZE
...
- Add a new flag to zipalign (-p) that page aligns shared
libraries (zip entries ending with ".so") in the archive.
- Add a new build variable LOCAL_PAGE_ALIGN_SHARED_LIBRARIES
to turn on this behaviour in zipalign.
- Add a new LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS to control
zip behaviour.
Bug: 8076853
Bug: 19330157
Co-Authored-By: Simon Baldwin <simonb@google.com >
Co-Authored-By: Dimitry Ivanov <dimitry@google.com >
Change-Id: I1aa2c039bb2a590ae72f256acc9ba5401c2c59b1
2015-02-26 12:31:40 +00:00
Justin Harrison
d2d9747199
am b89ec381
: am 070eea05
: am ffd4fee9
: Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev
...
* commit 'b89ec38113a22d09b0832ed2d3cb8fc413a14a75':
Revert "Allow system images larger than 2GiB."
2015-02-13 20:44:23 +00:00
Justin Harrison
b89ec38113
am 070eea05
: am ffd4fee9
: Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev
...
* commit '070eea05f2f2d47aa873fd1e79160eb8529a0eb8':
Revert "Allow system images larger than 2GiB."
2015-02-13 20:37:10 +00:00
Justin Harrison
ffd4fee911
Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev
2015-02-13 18:48:17 +00:00
Justin Harrison
2de68bbbf4
Revert "Allow system images larger than 2GiB."
...
This reverts commit cd082d4bfe
.
Change-Id: Ie63e1ba70d907d2849164871bc7ec71c245f7af9
2015-02-13 18:47:51 +00:00
Michael Runge
cad78c12fb
Do not use block_verify on target-files where feature is missing.
...
This will only be used when the block file format is at least
version 3. For V1/V2 (L, L MR1) block versions, fall back to
the old range_sha1 check.
Bug: 19357591
Change-Id: I7cb178b70d48ec3c98cdb88ed1c94cf7797a01d0
2015-02-11 19:28:08 -08:00
Baligh Uddin
e204868f1f
Add bootsigner path as an option
...
Change-Id: I71e8cb96b7a33cc02897fc24f6f3f61c7608bfe3
2015-02-11 15:43:02 +00:00
smain@google.com
f8136017fa
am 1cd422cd
: am 19b8c2f7
: am 8cde3e71
: am cf80e847
: am d162be5b
: change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
...
* commit '1cd422cd3d67c0821b29c75e91cac764ce4d1b47':
change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
2015-02-11 02:54:59 +00:00
smain@google.com
1cd422cd3d
am 19b8c2f7
: am 8cde3e71
: am cf80e847
: am d162be5b
: change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
...
* commit '19b8c2f776036288dfad8983e38419c3d4316fc9':
change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
2015-02-10 23:21:02 +00:00
smain@google.com
8cde3e71e7
am cf80e847
: am d162be5b
: change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
...
* commit 'cf80e8479bc71538902ac07df91fff8d544a174e':
change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
2015-02-10 19:12:49 +00:00
smain@google.com
cf80e8479b
am d162be5b
: change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
...
* commit 'd162be5b5f65ba0311374242d48303f120398d48':
change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
2015-02-10 19:05:42 +00:00
Jesse Zhao
4ec52a93d8
am 234d122e
: am c6af9b8f
: am 28b2b00a
: Merge "Update vendor fingerprint." into lmp-mr1-dev
...
* commit '234d122ea62a43aa3a1d6cfbf11a75e5dbe3f8e0':
Update vendor fingerprint.
2015-02-09 04:14:09 +00:00
Dan Albert
39a68ab310
am f8f91c94
: am 3907eaf8
: am cd082d4b
: Allow system images larger than 2GiB.
...
* commit 'f8f91c94706a953f91bf75e919b4302db6a9a99f':
Allow system images larger than 2GiB.
2015-02-09 04:14:08 +00:00
Jesse Zhao
234d122ea6
am c6af9b8f
: am 28b2b00a
: Merge "Update vendor fingerprint." into lmp-mr1-dev
...
* commit 'c6af9b8f4a09cc4208ad119218f57022d6fead5b':
Update vendor fingerprint.
2015-02-07 00:06:13 +00:00
Dan Albert
f8f91c9470
am 3907eaf8
: am cd082d4b
: Allow system images larger than 2GiB.
...
* commit '3907eaf8b7c6f7209c4cb11a6b8b66a34f292151':
Allow system images larger than 2GiB.
2015-02-07 00:06:10 +00:00
Jesse Zhao
28b2b00adb
Merge "Update vendor fingerprint." into lmp-mr1-dev
2015-02-06 22:21:06 +00:00
Dan Albert
cd082d4bfe
Allow system images larger than 2GiB.
...
Python 2.7's zipfile implementation wrongly thinks that zip64 is
required for files larger than 2GiB. We can work around this by
adjusting their limit. Note that `zipfile.writestr()` will not work
for strings larger than 2GiB. The Python interpreter sometimes rejects
strings that large (though it isn't clear to me exactly what
circumstances cause this). `zipfile.write()` must be used directly to
work around this.
This mess can be avoided if we port to python3.
Bug: 18015246
Change-Id: I8a476d99c5efdef6ea408373b706e9fbd3a798be
2015-02-06 13:24:06 -08:00
Jesse Zhao
2625d27151
Update vendor fingerprint.
...
Change-Id: I5d4abdff8b7b13e01271440f4d4f2ffe1b015b71
Bug: 19257598
2015-02-06 09:50:06 -08:00
Sami Tolvanen
431d42f857
Merge "Change transfer list format to include block hashes"
2015-02-06 10:27:11 +00:00
smain@google.com
d162be5b5f
change video analytics to distinguish between start and resume events.
...
also scrub out any additional parameters from the videoId before passing to analytics
Change-Id: Idf3351028e62d0d03c0f680a904bb83ef8353797
2015-02-05 17:49:49 -08:00
Ryosuke Matsuuchi
37c84ae309
doc: Add Japanese version of DAC/distribute/ page.
...
Bug: 18847144
Change-Id: I1bce6f94149e31ddb45b5946951cf6877bf4bf3b
2015-02-05 21:56:48 +09:00
Ying Wang
18202932d1
am f4bd044f
: am d51b0fd3
: Merge "Fail even dev build when property value exceeds length limit."
...
* commit 'f4bd044f09529430bdc9ac3cba083a39867dfab4':
Fail even dev build when property value exceeds length limit.
2015-02-05 02:36:41 +00:00
Ying Wang
f4bd044f09
am d51b0fd3
: Merge "Fail even dev build when property value exceeds length limit."
...
* commit 'd51b0fd3e4b3b39a36019bb1cd06fe29979f4ee8':
Fail even dev build when property value exceeds length limit.
2015-02-05 02:31:30 +00:00
Ying Wang
38df101343
Fail even dev build when property value exceeds length limit.
...
Let developers know the issue earlier when they set up new
products.
Change-Id: I3f2ecbc3a833c1a8a84bd75407a5c035e5fea70a
2015-02-04 15:10:59 -08:00
Ying Wang
3e9b20e430
am 16ba2ed8
: resolved conflicts for merge of 4c178ebc
to lmp-mr1-dev-plus-aosp
...
* commit '16ba2ed82bc084d5355477a381cc0bcc8b60a7bd':
Remove support of factory ramdisk/bundle.
2015-02-04 19:33:14 +00:00
Ying Wang
16ba2ed82b
resolved conflicts for merge of 4c178ebc
to lmp-mr1-dev-plus-aosp
...
Change-Id: If84527e9333b855d406dc7ac317868f4cfd3f1f2
2015-02-04 11:28:56 -08:00
Ying Wang
14cc23d433
Remove support of factory ramdisk/bundle.
...
Bug: 18779515
Change-Id: Ia6d51d43965447e2e95944a7d2b4b41adb121cb7
2015-02-04 11:00:01 -08:00
Sami Tolvanen
cac671a9d1
Change transfer list format to include block hashes
...
Add source and target block hashes as parameters to transfer list
commands that copy or patch data to a partition. This allows the
updater to verify the status of each command in the transfer list
and makes resuming block based OTAs possible. Due to the changes,
update the transfer list version to 3.
Needs matching changes from
I1e752464134aeb2d396946348e6041acabe13942
Bug: 18262110
Change-Id: Ia5c56379f570047f10f0aa7373a1025439495c98
2015-01-30 11:34:27 +00:00
Jesse Zhao
3de822dd3c
am 5827eec0
: am fbc8c145
: am 0c9384d5
: Merge "verify system and vendor image together before patching." into lmp-mr1-dev
...
* commit '5827eec013e88279b87cfed1b96bc675a1f1329d':
verify system and vendor image together before patching.
2015-01-29 17:21:12 +00:00
Jesse Zhao
5827eec013
am fbc8c145
: am 0c9384d5
: Merge "verify system and vendor image together before patching." into lmp-mr1-dev
...
* commit 'fbc8c1454e8f2167635398078bb53033dc90f15d':
verify system and vendor image together before patching.
2015-01-28 23:42:18 +00:00
Jesse Zhao
0c9384d512
Merge "verify system and vendor image together before patching." into lmp-mr1-dev
2015-01-28 23:30:54 +00:00
Narayan Kamath
41759234f0
am 675a726f
: resolved conflicts for merge of 8f5fc9e2
to lmp-mr1-dev-plus-aosp
...
* commit '675a726fe4ca70beb1ecccb8c5f78dcc8f65cac8':
Add ro.product.locale
2015-01-22 19:58:04 +00:00