Mohamad Ayyash
6f79df6ced
resolved conflicts for merge of af094912
to mnc-dev-plus-aosp
2015-06-25 12:13:56 -07:00
Mohamad Ayyash
af094912eb
am 19cfe7db: Merge "Add img2simg in host and ota packages"
...
* commit '19cfe7db4ce414ce36c973fe90e94afa898194d6':
Add img2simg in host and ota packages
2015-06-25 18:56:45 +00:00
Mohamad Ayyash
19cfe7db4c
Merge "Add img2simg in host and ota packages"
2015-06-25 18:44:03 +00:00
Mohamad Ayyash
c11e90125e
am ef08174a: am 042e8519: Merge "build_image.py: Make sparse squashfs images"
...
* commit 'ef08174a93ca0539d0fb0be20082ead4d136c5a0':
build_image.py: Make sparse squashfs images
2015-06-25 00:45:13 +00:00
Mohamad Ayyash
7ed6a4731b
am 4f177cc6: am 48cb24a6: am 648e40e8: build_image.py: Make sparse squashfs images
...
* commit '4f177cc6e9c76ab3234772b463fc4e046b15a273':
build_image.py: Make sparse squashfs images
2015-06-24 23:42:31 +00:00
Mohamad Ayyash
99811e45d0
am 07a7590f: Merge "build_image.py: Make sparse squashfs images" into mnc-dev
...
* commit '07a7590f087e4ce7783e0907c9e5c84e18a6481e':
build_image.py: Make sparse squashfs images
2015-06-24 23:42:30 +00:00
Simon Wilson
5e14d57658
am b7b7aede: Merge "resolved conflicts for merge of ecfc97f7
to mnc-dev" into mnc-dev
...
* commit 'b7b7aedeb3c960890e3842ec8e729dbd10077ae4':
Add compressor options for squashfs system images
2015-06-24 23:42:29 +00:00
Mohamad Ayyash
5ee381704f
am 914811a9: Merge "Add img2simg in host and ota packages" into mnc-dev
...
* commit '914811a9f283ed3d8aa826abddf8c11f6167dc14':
Add img2simg in host and ota packages
2015-06-24 23:42:27 +00:00
Mohamad Ayyash
4f177cc6e9
am 48cb24a6: am 648e40e8: build_image.py: Make sparse squashfs images
...
* commit '48cb24a655b58c3b2147f120223627a357ad6372':
build_image.py: Make sparse squashfs images
2015-06-24 23:16:18 +00:00
Mohamad Ayyash
07a7590f08
Merge "build_image.py: Make sparse squashfs images" into mnc-dev
2015-06-24 23:15:56 +00:00
Simon Wilson
b7b7aedeb3
Merge "resolved conflicts for merge of ecfc97f7
to mnc-dev" into mnc-dev
2015-06-24 23:14:07 +00:00
Mohamad Ayyash
914811a9f2
Merge "Add img2simg in host and ota packages" into mnc-dev
2015-06-24 23:13:51 +00:00
Mohamad Ayyash
9764892031
Add img2simg in host and ota packages
...
Change-Id: Ide660cf3cf69c74bbd15d0ac6642b60d58f076fa
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-24 16:08:15 -07:00
Simon Wilson
6d5ddc32ab
resolved conflicts for merge of ecfc97f7
to mnc-dev
...
Change-Id: Ic7661c4176dc87cb2796f9cbb61bdd64f89cdc01
2015-06-24 16:06:34 -07:00
Mohamad Ayyash
353265b081
Add img2simg in host and ota packages
...
Change-Id: Ide660cf3cf69c74bbd15d0ac6642b60d58f076fa
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-24 23:01:27 +00:00
Mohamad Ayyash
48cb24a655
am 648e40e8: build_image.py: Make sparse squashfs images
...
* commit '648e40e8660135f37adad5981a48250476c2f3fd':
build_image.py: Make sparse squashfs images
2015-06-24 22:52:10 +00:00
Mohamad Ayyash
869a96a1ca
am 4826dee7: am 9ca7fa89: resolved conflicts for merge of 1b748051
to lmp-mr1-ub-dev
...
* commit '4826dee78d1e5834aed73b40a11432e2ea5b85a9':
common.py: Add support for squashfs
2015-06-24 22:51:34 +00:00
Simon Wilson
ecfc97f772
resolved conflicts for merge of f86e7eea
to lmp-mr1-ub-dev
...
Change-Id: I746021aa57edd5f6fae6e57cec0908951a659664
2015-06-24 15:42:27 -07:00
Mohamad Ayyash
4826dee78d
am 9ca7fa89: resolved conflicts for merge of 1b748051
to lmp-mr1-ub-dev
...
* commit '9ca7fa8993bceb97a6256b60742eeda2f699560b':
common.py: Add support for squashfs
2015-06-24 22:26:02 +00:00
Mohamad Ayyash
ef08174a93
am 042e8519: Merge "build_image.py: Make sparse squashfs images"
...
* commit '042e851999a73fd14cd612b9c934ab2b2f308b75':
build_image.py: Make sparse squashfs images
2015-06-24 22:13:08 +00:00
Mohamad Ayyash
9ca7fa8993
resolved conflicts for merge of 1b748051
to lmp-mr1-ub-dev
2015-06-24 15:04:38 -07:00
Mohamad Ayyash
042e851999
Merge "build_image.py: Make sparse squashfs images"
2015-06-24 22:01:00 +00:00
Adam Powell
f874dbb012
am 30638322: Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 2" into mnc-dev
...
* commit '30638322e7728c193a0d462bd809065500443558':
Bump PLATFORM_PREVIEW_SDK_VERSION to 2
2015-06-24 20:55:43 +00:00
Adam Powell
30638322e7
Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 2" into mnc-dev
2015-06-24 20:32:15 +00:00
Adam Powell
0cf80f3ab8
Bump PLATFORM_PREVIEW_SDK_VERSION to 2
...
Change-Id: I6633e0077a6a89ef737d7c4b686aab033d94c41b
2015-06-24 13:04:22 -07:00
Mohamad Ayyash
2cd51cc711
build_image.py: Make sparse squashfs images
...
Change-Id: Iea0399868a9406f9929d8176d61d5698a2043697
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-24 11:08:00 -07:00
Mohamad Ayyash
648e40e866
build_image.py: Make sparse squashfs images
...
Change-Id: Iea0399868a9406f9929d8176d61d5698a2043697
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-24 10:54:16 -07:00
Mohamad Ayyash
fa6c8a9b79
build_image.py: Make sparse squashfs images
...
Change-Id: Iea0399868a9406f9929d8176d61d5698a2043697
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-24 10:44:52 -07:00
Michael Wright
b20475db10
am 7371a7a5: Add hid command to base build
...
* commit '7371a7a5b596f96f8bebf157a7dc261c545a2315':
Add hid command to base build
2015-06-24 17:13:52 +00:00
Michael Wright
7371a7a5b5
Add hid command to base build
...
Bug: 21662862
Change-Id: I11ed67b8f0efd1232ddfbb6e0a5f4bdbb065397e
2015-06-24 15:55:47 +01:00
Mohamad Ayyash
865369e63b
am 9ff8a716: am f35ed6bd: resolved conflicts for merge of cade49dd
to lmp-mr1-ub-dev
...
* commit '9ff8a7162b1c6f8d10768537a8e3f45601d8d6da':
Allow flashing a squashfs system image
2015-06-24 02:13:41 +00:00
Tao Bao
344af6d18c
am 7102f577: Merge "Adjust the size computation for reserved blocks" into mnc-dev
...
* commit '7102f57781a8cde2e450951af3cbd7e60b44dca1':
Adjust the size computation for reserved blocks
2015-06-24 02:13:40 +00:00
Tao Bao
f1554ed93f
am 2b4ff174: Fix the error in sparse_img.py
...
* commit '2b4ff174ff09d3d4f69897c8f8004c57836975b4':
Fix the error in sparse_img.py
2015-06-24 02:13:39 +00:00
Tao Bao
8adebf62f8
am ca8fb0f2: am c9fcdae2: Merge "Fix the error in sparse_img.py"
...
* commit 'ca8fb0f21f3b4b91d60e0678b512f59167d79fda':
Fix the error in sparse_img.py
2015-06-24 02:01:11 +00:00
Mohamad Ayyash
9ff8a7162b
am f35ed6bd: resolved conflicts for merge of cade49dd
to lmp-mr1-ub-dev
...
* commit 'f35ed6bd8497633c057030e5442cd0fc29b37b6c':
Allow flashing a squashfs system image
2015-06-24 01:38:26 +00:00
Tao Bao
ca8fb0f21f
am c9fcdae2: Merge "Fix the error in sparse_img.py"
...
* commit 'c9fcdae29dafc998f11ad49fec07d508879b8785':
Fix the error in sparse_img.py
2015-06-24 00:59:35 +00:00
Tao Bao
7102f57781
Merge "Adjust the size computation for reserved blocks" into mnc-dev
2015-06-24 00:53:17 +00:00
Tao Bao
c9fcdae29d
Merge "Fix the error in sparse_img.py"
2015-06-24 00:50:41 +00:00
Tao Bao
109555753f
Fix the error in sparse_img.py
...
Bug: 22046423
Change-Id: I0796e14df2b523570f0c485d146273f5e5aa5494
(cherry picked from commit 2b4ff174ff
)
2015-06-23 17:44:48 -07:00
Tao Bao
2b4ff174ff
Fix the error in sparse_img.py
...
Bug: 22046423
Change-Id: I9c257002c405277557974fadfe27942c38c3cd04
2015-06-23 17:36:10 -07:00
Mohamad Ayyash
f35ed6bd84
resolved conflicts for merge of cade49dd
to lmp-mr1-ub-dev
2015-06-23 16:22:32 -07:00
Tao Bao
efbb5d2e69
Adjust the size computation for reserved blocks
...
Due to the change in https://lwn.net/Articles/546473/ , kernel reserves a
few extra blocks (lesser of 2% and 4096 blocks) on ext4 FS which leads to
OTA update failures. Adjust the size computation if the device has
BOARD_HAS_EXT4_RESERVED_BLOCKS := true.
Bug: 21522719
Bug: 22023465
Change-Id: I49f16adbf2dedc5279fbb8622bf99ef71dcc494f
2015-06-23 14:53:28 -07:00
Ying Wang
b3ba45c5df
am cb544c25: am 83aca79b: Merge "Don\'t include static executables when SANITIZE_TARGET=address"
...
* commit 'cb544c2507cc6caafec61eff67405096868a7bc8':
Don't include static executables when SANITIZE_TARGET=address
2015-06-23 20:53:40 +00:00
Tao Bao
44dbba98b8
am bebd3cfb: Use fstab in the source build
...
* commit 'bebd3cfbf934beb18b73a4d4e98b98c2c0a1d6fe':
Use fstab in the source build
2015-06-23 20:46:04 +00:00
Ying Wang
cb544c2507
am 83aca79b: Merge "Don\'t include static executables when SANITIZE_TARGET=address"
...
* commit '83aca79b8df3296e24122f3ed9016f1463edb451':
Don't include static executables when SANITIZE_TARGET=address
2015-06-23 20:11:24 +00:00
Ying Wang
83aca79b8d
Merge "Don't include static executables when SANITIZE_TARGET=address"
2015-06-23 19:59:56 +00:00
Elliott Hughes
547eae2ac0
am 1ea32049: am b7f56b97: Merge "Revert "Hide unwinder symbols in each binary.""
...
* commit '1ea32049c9e302dd3b464948609828b53f32e544':
Revert "Hide unwinder symbols in each binary."
2015-06-23 19:51:07 +00:00
Elliott Hughes
1ea32049c9
am b7f56b97: Merge "Revert "Hide unwinder symbols in each binary.""
...
* commit 'b7f56b979bbfe00b67f6f6d573d43bcf607649eb':
Revert "Hide unwinder symbols in each binary."
2015-06-23 19:38:36 +00:00
Elliott Hughes
b7f56b979b
Merge "Revert "Hide unwinder symbols in each binary.""
2015-06-23 19:29:27 +00:00
Bart Sears
61f675bb53
Revert "Hide unwinder symbols in each binary."
...
This reverts commit dc30a16ba2
.
Change-Id: Ib6af148bcaa3041b3040e525442a39b493852794
2015-06-23 19:23:13 +00:00