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
c6af9b8f4a
am 28b2b00a: Merge "Update vendor fingerprint." into lmp-mr1-dev
...
* commit '28b2b00adb7b77a5a6e5654e078c887ed5a425aa':
Update vendor fingerprint.
2015-02-06 22:27:27 +00:00
Jesse Zhao
28b2b00adb
Merge "Update vendor fingerprint." into lmp-mr1-dev
2015-02-06 22:21:06 +00:00
Dan Albert
3907eaf8b7
am cd082d4b: Allow system images larger than 2GiB.
...
* commit 'cd082d4bfe917b2e6b97436839cbbbc67c733c83':
Allow system images larger than 2GiB.
2015-02-06 21:41:09 +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
Andres Morales
5038247772
am 8859f029: am b998054f: Merge "Add system/build.prop dependency on vendor/bootimg"
...
* commit '8859f0294979d7be169abe2787ad84044b6714f2':
Add system/build.prop dependency on vendor/bootimg
2015-02-06 18:29:24 +00:00
Andres Morales
8859f02949
am b998054f: Merge "Add system/build.prop dependency on vendor/bootimg"
...
* commit 'b998054f50043c23e8599ee3cfae058ac378c5cb':
Add system/build.prop dependency on vendor/bootimg
2015-02-06 18:23:12 +00:00
Andres Morales
b998054f50
Merge "Add system/build.prop dependency on vendor/bootimg"
2015-02-06 18:11:30 +00: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
Andres Morales
a09f2f44cc
Add system/build.prop dependency on vendor/bootimg
...
When incremental builds only affect the system partition,
the build.prop file for other partitions might go out of
date.
Add a dependency on system/build.prop s.t. when
it's rebuilt,
the fingerprints are updated on the other
partition's build.prop's.
Bug:19058575
Change-Id: Iea7b761e0800c402eb4ce1154e8f6af5a17f7b06
2015-02-05 12:42:43 -08:00
Elliott Hughes
a7442d5219
am 1888ab84: am 9edd7649: Merge "Remove mkyaffs2image references."
...
* commit '1888ab842a4308c3898beec434ac59bcda12617b':
Remove mkyaffs2image references.
2015-02-05 20:16:00 +00:00
Elliott Hughes
4244392ea9
am 57555891: am ed556858: Merge "Make sure we keep building grep now it\'s broken out from toolbox."
...
* commit '5755589141358a4f82cada56e6738075c670011f':
Make sure we keep building grep now it's broken out from toolbox.
2015-02-05 20:15:59 +00:00
Elliott Hughes
1888ab842a
am 9edd7649: Merge "Remove mkyaffs2image references."
...
* commit '9edd76494d4378bd740dd22a2eb4f5d0eb0db40f':
Remove mkyaffs2image references.
2015-02-05 18:47:25 +00:00
Elliott Hughes
5755589141
am ed556858: Merge "Make sure we keep building grep now it\'s broken out from toolbox."
...
* commit 'ed556858262a7311f0145f1d1c605f7cec7c18c4':
Make sure we keep building grep now it's broken out from toolbox.
2015-02-05 18:47:21 +00:00
Yohann Roussel
9d528c778b
Merge "Engage Jack incremental on demand"
2015-02-05 11:01:22 +00:00
Yohann Roussel
4283c36732
Merge "Simplify handling of ANDROID_JACK_* variables"
2015-02-05 08:37:42 +00:00
Elliott Hughes
9edd76494d
Merge "Remove mkyaffs2image references."
2015-02-05 04:04:42 +00:00
Elliott Hughes
65d4186f85
Remove mkyaffs2image references.
...
Change-Id: I1d112515bc92353a5b48ec668e1cadfb51ecdaad
2015-02-04 19:58:09 -08:00
Elliott Hughes
ed55685826
Merge "Make sure we keep building grep now it's broken out from toolbox."
2015-02-05 03:35:48 +00:00
Elliott Hughes
c00dedb21c
Make sure we keep building grep now it's broken out from toolbox.
...
Change-Id: Ib71e37c5ba238136a9790cd92ecec745e099341e
2015-02-04 18:56:17 -08: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
d51b0fd3e4
Merge "Fail even dev build when property value exceeds length limit."
2015-02-04 23:33:20 +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
4c178ebcc0
Merge "Remove support of factory ramdisk/bundle."
2015-02-04 19:08:09 +00:00
Ying Wang
14cc23d433
Remove support of factory ramdisk/bundle.
...
Bug: 18779515
Change-Id: Ia6d51d43965447e2e95944a7d2b4b41adb121cb7
2015-02-04 11:00:01 -08:00
Yohann Roussel
37822c443d
Engage Jack incremental on demand
...
Each module may engage Jack incremental with
LOCAL_JACK_ENABLED := incremental
Include renaming of LOCAL_USE_JACK to LOCAL_JACK_ENABLED that is
now accepting 3 values "disabled", "full" and "incremental".
Change-Id: Icbff275b397bee36b29312e821f3e8d45f83fbcc
2015-02-04 11:22:26 +01:00
Ying Wang
f65bde3e78
am e9bc7b47: am 4d0f56fb: Merge "Disable transitive dependency library symbol resolving for mips."
...
* commit 'e9bc7b472db2d54aaef428fc3229b56dbe2bf6fa':
Disable transitive dependency library symbol resolving for mips.
2015-02-03 19:50:01 +00:00
Ying Wang
e9bc7b472d
am 4d0f56fb: Merge "Disable transitive dependency library symbol resolving for mips."
...
* commit '4d0f56fba3cb89d871e1277d9314da12406394e5':
Disable transitive dependency library symbol resolving for mips.
2015-02-03 19:43:52 +00:00
Ying Wang
4d0f56fba3
Merge "Disable transitive dependency library symbol resolving for mips."
2015-02-03 19:30:17 +00:00
Ying Wang
624ef02a50
Disable transitive dependency library symbol resolving for mips.
...
The transitive symbol resolving causes build breakage when a binary
linked against NDK has indirect dependency on platform libraries, or
vice versa.
Change-Id: Idbfe76079c1db14eb1156d0f396e13d26f0ff582
2015-02-03 10:58:50 -08:00
Yohann Roussel
2809666941
Simplify handling of ANDROID_JACK_* variables
...
This concerns ANDROID_JACK_VM, ANDROID_JACK_VM_ARGS and
ANDROID_JACK_EXTRA_ARGS.
Change-Id: Iba75ecaaceb09ac9607a3aee41324d9f5ae4beef
2015-02-03 12:37:09 +01:00
Ying Wang
6bcc01a812
Allow to build resource only Java module.
...
Change-Id: I0ccce1f3e336fe25d3b36471664042d1f144c74a
2015-02-02 15:33:31 -08:00
Ying Wang
38a9d5a739
am 10500d0e: resolved conflicts for merge of 5cb4276e
to lmp-mr1-dev-plus-aosp
...
* commit '10500d0ea7706a6a137e8afdd347d927f5512488':
Add target recoveryimage-nodeps.
2015-01-31 02:00:26 +00:00
Ying Wang
10500d0ea7
resolved conflicts for merge of 5cb4276e
to lmp-mr1-dev-plus-aosp
...
Change-Id: Ia7f011f24276e7e8e045a2544e5dff2b758b1c62
2015-01-30 16:57:37 -08:00
Ying Wang
5cb4276e48
Merge "Add target recoveryimage-nodeps."
2015-01-31 00:33:06 +00:00
Ying Wang
747b9f18f0
Add target recoveryimage-nodeps.
...
Change-Id: Ie7d11ae8f40260bf23481931c18523895c87ebd7
2015-01-30 14:16:00 -08:00
Ying Wang
9f159c577c
am 5cfcf91f: am 7023f614: am 7245b4e2: Support dpi specific aapt flags.
...
* commit '5cfcf91feabb72170840c1bf76f626b2d4657e38':
Support dpi specific aapt flags.
2015-01-30 21:28:23 +00:00
Ying Wang
5534ade20c
am 385f5e7d: am 7ecc76a0: Support dpi specific aapt flags.
...
* commit '385f5e7d090d4721e61d0db60e7287dae8117b77':
Support dpi specific aapt flags.
2015-01-30 21:19:47 +00:00
Ying Wang
5cfcf91fea
am 7023f614: am 7245b4e2: Support dpi specific aapt flags.
...
* commit '7023f614e240687e433368a6bfe4116d8f1fedcf':
Support dpi specific aapt flags.
2015-01-30 21:18:07 +00:00
Ying Wang
385f5e7d09
am 7ecc76a0: Support dpi specific aapt flags.
...
* commit '7ecc76a0f206c07dfd0db9c81673514a31719d33':
Support dpi specific aapt flags.
2015-01-30 19:34:45 +00:00
Ying Wang
7023f614e2
am 7245b4e2: Support dpi specific aapt flags.
...
* commit '7245b4e2bed6cef8c6bf4cc67ffd98989fde3c91':
Support dpi specific aapt flags.
2015-01-30 19:34:22 +00:00
Elliott Hughes
22f979f76a
am 84146f73: am 01da8cbc: Merge "envsetup.sh : add help text for sepgrep and mangrep commands"
...
* commit '84146f73014ac0037bfafa84f5075aa98dd6e2ef':
envsetup.sh : add help text for sepgrep and mangrep commands
2015-01-30 19:32:12 +00: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