StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,911 Commits 1 Branch 0 Tags
973decf35c2592d6ab9ab5ad9e94e36cd61e0c16
Commit Graph

3402 Commits

Author SHA1 Message Date
Tao Bao
c607474ec2 am 11d4406e: am 48a27bcb: Merge "Fix OTA scripts to generate incremental BBOTA with OEM property." 
* commit '11d4406eb9796819baeafda3142b16f9cc63d532':
  Fix OTA scripts to generate incremental BBOTA with OEM property.
 2015-07-06 16:49:18 +00:00
Tao Bao
9b1a9ec53f am 11d4406e: am 48a27bcb: Merge "Fix OTA scripts to generate incremental BBOTA with OEM property." 
* commit '11d4406eb9796819baeafda3142b16f9cc63d532':
  Fix OTA scripts to generate incremental BBOTA with OEM property.
 2015-07-06 16:49:06 +00:00
Tao Bao
3806c231a9 Fix OTA scripts to generate incremental BBOTA with OEM property. 
Bug: 21803136
Change-Id: I3a45e8aea0b4f4f4f2acb4c9c8a7fad7a014680c
 2015-07-05 21:08:33 -07:00
Dirk Dougherty
0b9e204df0 Support matching unicode characters in suggestions by changing match(regex) to indexOf(string). 
Change-Id: I460a5cb43e4be6ff552a7b2d41b6d3957f2d02a2
 2015-07-02 14:21:55 -07:00
Chris Elliott
1e253e76b9 Merge "DO NOT MERGE Fix the syntax error in the edify script generator" into cw-d-mr1-dev 2015-07-02 20:18:35 +00:00
Tao Bao
4dacce92ce DO NOT MERGE Fix the syntax error in the edify script generator 
file_getprop() always expects two arguments.

Bug: 19881931
Change-Id: Icf5577ad34188991c03f68c1217642d3adc4201c
 2015-07-02 13:17:21 -07:00
Tao Bao
41bcf3e425 Fix build. 
Change-Id: Id3eb4821a3c3061063a00294bfa268693c773eb8
 2015-07-01 19:38:34 -07:00
Tao Bao
8bd720257e resolved conflicts for merge of 8787cd6d to mnc-dev 
Change-Id: I19497d05a021c21c905b2bddd5b36d370dc2208f
 2015-07-01 18:06:33 -07:00
Tao Bao
608d9d2452 am 1aa1af0e: sparse_img.py: Don\'t write empty map groups. 
* commit '1aa1af0e997699bc025e4f0a754692068328d7e6':
  sparse_img.py: Don't write empty map groups.
 2015-07-02 00:47:51 +00:00
Simon Wilson
e416a41f3a am 16401ad4: Revert "sparse_img.py: Don\'t write empty map groups." 
* commit '16401ad4256178fbe7a2cd8588e6dbf9a6c63180':
  Revert "sparse_img.py: Don't write empty map groups."
 2015-07-02 00:47:50 +00:00
Tao Bao
8787cd6d4e resolved conflicts for merge of 7f9470cd to lmp-mr1-ub-dev 
Change-Id: Icfc94fcc4178f5fbfad62df9914c84d59d140bb7
 2015-07-01 17:44:53 -07:00
Tao Bao
1aa1af0e99 sparse_img.py: Don't write empty map groups. 
In certain cases, we may have no mapping of ZERO or NONZERO blocks in
the image (such as squashfs at the moment). Don't write those groups if
they are empty.

Change-Id: I4a1f0105ada2e1573c3d6162457b83725e0d8971
 2015-07-01 11:24:30 -07:00
Simon Wilson
16401ad425 Revert "sparse_img.py: Don't write empty map groups." 
This reverts commit 7f9470cda3.

Change-Id: I97e2859903fbc4f1e6f0824269ae88b23f63e032
 2015-07-01 18:10:28 +00:00
Tao Bao
7f9470cda3 sparse_img.py: Don't write empty map groups. 
In certain cases, we may have no mapping of ZERO or NONZERO blocks in
the image (such as squashfs at the moment). Don't write those groups if
they are empty.

Change-Id: I82aa05fbbd79130b08868585edd5298e531c4f5a
 2015-07-01 10:10:31 -07:00
Tao Bao
4e66343b2b Retry adjusting 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.

It amends the last attemp in [1]. Now it computes the used blocks from the
make_ext4fs output, instead of altering its argument.

[1]: commit efbb5d2e69.

Bug: 21522719
Bug: 22023465
Bug: 22174684
Change-Id: Iaae6507f6de68a5892f2e3035d330039287b4492
(cherry picked from commit c7a6f1e4f8)
 2015-06-30 12:17:28 -07:00
Tao Bao
ed95997724 resolved conflicts for merge of c7a6f1e4 to mnc-dev-plus-aosp 
Change-Id: I3201c1d7f9e8b451614259c2fec70c07ae9c8332
 2015-06-30 09:33:12 -07:00
Tao Bao
c7a6f1e4f8 Retry adjusting 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.

It amends the last attemp in [1]. Now it computes the used blocks from the
make_ext4fs output, instead of altering its argument.

[1]: commit efbb5d2e69.

Bug: 21522719
Bug: 22023465
Bug: 22174684
Change-Id: I9783a51abe6581ff5c75db81e78ac606d0f32c4c
 2015-06-29 20:45:53 -07:00
Tao Bao
bdf7d94aac am 2384d01c: Revert "Adjust the size computation for reserved blocks" 
* commit '2384d01c1c4c5b259840ec526ec8f5ec18cd8087':
  Revert "Adjust the size computation for reserved blocks"
 2015-06-29 20:56:34 +00:00
Tao Bao
2384d01c1c Revert "Adjust the size computation for reserved blocks" 
We should not change the parameter to mkfs_ext4. Bug filed at
b/22174684. Will come up with a new CL.

This reverts commit efbb5d2e69.

Change-Id: I15f7a9a07a65a936ba186d2ce672ec4832ed3e17
 2015-06-29 12:55:38 -07:00
Tao Bao
929fbe7d37 am 0f0af20d: am 5df6b5c3: Merge "sparse_img.py: Don\'t write empty map groups." 
* commit '0f0af20d6d4fa7d75f7dd8569f713e68eb0cad46':
  sparse_img.py: Don't write empty map groups.
 2015-06-27 16:58:36 +00:00
Tao Bao
a89781204e sparse_img.py: Don't write empty map groups. 
In certain cases, we may have no mapping of ZERO or NONZERO blocks in
the image (such as squashfs at the moment). Don't write those groups if
they are empty.

Change-Id: I82aa05fbbd79130b08868585edd5298e531c4f5a
 2015-06-27 09:21:31 -07:00
Tao Bao
c94a705f44 Merge "Use fstab in the source build" 2015-06-26 22:57:09 +00:00
Tao Bao
dd77b561e5 Merge "Support SELinux context label when mounting" 2015-06-26 22:56:57 +00:00
Tao Bao
34b47bf42b Use fstab in the source build 
When generating incremental OTAs, we should use the fstab in the source
build instead of the target one. Similarly for recovery_mount_options.

Bug: 22011892
Change-Id: Ia02584c71af7d47835b1f62e7daa46f27940a545
(cherry picked from commit bebd3cfbf9)
 2015-06-26 15:53:16 -07:00
Ying Wang
f6bb95b7a9 am 48f68478: am 8f180b90: Merge "Create userdata.img with real data when SANITIZE_TARGET=address." 
* commit '48f68478bd2a375886f30c01b63920575739d9db':
  Create userdata.img with real data when SANITIZE_TARGET=address.
 2015-06-25 21:54:52 +00:00
Ying Wang
8f180b904f Merge "Create userdata.img with real data when SANITIZE_TARGET=address." 2015-06-25 21:29:52 +00:00
Ying Wang
2a04839aec Create userdata.img with real data when SANITIZE_TARGET=address. 
Bug: 21785137
Change-Id: Ie0c36988759fe07419ad29bab5a71cdd0d992d2a
 2015-06-25 14:29:04 -07: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
07a7590f08 Merge "build_image.py: Make sparse squashfs images" into mnc-dev 2015-06-24 23:15:56 +00: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
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
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
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
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
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
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
Tao Bao
7102f57781 Merge "Adjust the size computation for reserved blocks" into mnc-dev 2015-06-24 00:53:17 +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
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
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
Tao Bao
bebd3cfbf9 Use fstab in the source build 
When generating incremental OTAs, we should use the fstab in the source
build instead of the target one. Similarly for recovery_mount_options.

Bug: 22011892
Change-Id: Idb5c72d1a792e8bb40376a380e3dc06136b13652
 2015-06-22 19:27:59 -07:00
Simon Wilson
f86e7eeabc Add compressor options for squashfs system images 
Change-Id: I2a75f8754273f6e00b96ba6aca6741c4388f5da8
 2015-06-22 15:42:52 -07:00
David Friedman
f1af247718 am 275ed9c5: am 552de126: am 42c75239: Merge "Docs: Fixing disappearance of the left-navs in NDK minisite." into mnc-preview-docs 
* commit '275ed9c5ab26cd4b6527aea3a695bc9bda9d4b32':
  Docs: Fixing disappearance of the left-navs in NDK minisite.
 2015-06-17 22:37:19 +00:00
David Friedman
275ed9c5ab am 552de126: am 42c75239: Merge "Docs: Fixing disappearance of the left-navs in NDK minisite." into mnc-preview-docs 
* commit '552de126e9b05b1c34db1c66a62615fc2ea3cee1':
  Docs: Fixing disappearance of the left-navs in NDK minisite.
 2015-06-17 22:12:06 +00:00
David Friedman
552de126e9 am 42c75239: Merge "Docs: Fixing disappearance of the left-navs in NDK minisite." into mnc-preview-docs 
* commit '42c752392ceea6854c423339eedede6f4fdf6696':
  Docs: Fixing disappearance of the left-navs in NDK minisite.
 2015-06-17 21:57:47 +00:00