openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity
23,824 Commits 2 Branches 1 Tag 73 MiB
Commit Graph

3038 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 3806c231a9 Fix OTA scripts to generate incremental BBOTA with OEM property. 
Bug: 21803136
Change-Id: I3a45e8aea0b4f4f4f2acb4c9c8a7fad7a014680c
 2015-07-05 21:08:33 -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
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 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
David Friedman 42c752392c Merge "Docs: Fixing disappearance of the left-navs in NDK minisite." into mnc-preview-docs 2015-06-17 21:51:07 +00:00
David Friedman c997cf910b Docs: Fixing disappearance of the left-navs in NDK minisite. 
When the filepath changed from html-ndk/ndk/ to html/ndk, the build
system could no longer find the _toc files. This change fixes that issue.

Change-Id: I51f19159e6636fb90ed04013b11d7f95fb4e04c3
 2015-06-17 14:36:05 -07:00
Dan Albert 1a31eea230 am e514639f: am 2a884eef: Merge "Stop disallowing sanitizers." 
* commit 'e514639feba9ce77c36b8fee23e893fff8b4be0f':
  Stop disallowing sanitizers.
 2015-06-17 17:45:37 +00:00
Dan Albert 944fc40eda Stop disallowing sanitizers. 
Change-Id: I641cb3fe998184f8926324e3365a7a99d87263df
 2015-06-16 22:20:19 -07:00
Mohamad Ayyash 1b748051dd common.py: Add support for squashfs 
Change-Id: Ia40f8c6307d0213d43207aee91c4c8a5b5ad6f1e
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
 2015-06-16 13:18:44 -07:00
Mohamad Ayyash cade49ddee Allow flashing a squashfs system image 
Change-Id: Ic51d11274784a8d2e9d57d5f0b821ebc89680e5a
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
 2015-06-16 13:11:21 -07:00
Tao Bao 05451045c9 am abfe1044: Merge "Support SELinux context label when mounting" into mnc-dev 
* commit 'abfe10440836f4bbd513b83cf731788099dd81b4':
  Support SELinux context label when mounting
 2015-06-11 02:08:14 +00:00
Tao Bao df06e96826 Support SELinux context label when mounting 
If there is a SELinux context label in the recovery.fstab, we should
honor that when mounting the partition.

Bug: 19764039
Change-Id: Ic80a3377a5a94c9d10dd464eb1257b157a947510
(cherry picked from commit 548eb76c8f)
 2015-06-10 16:20:18 -07:00
Tao Bao 548eb76c8f Support SELinux context label when mounting 
If there is a SELinux context label in the recovery.fstab, we should
honor that when mounting the partition.

Bug: 19764039
Change-Id: I4df71a092b418cd340a18b2e3b0936de33d8e3f5
 2015-06-10 15:35:34 -07:00
Baligh Uddin d80f08688c am 942a42e3: Merge "Allow custom boot_signer and verity_signer." into mnc-dev 
* commit '942a42e31de9a0468014a256ed7fdd67cb208e64':
  Allow custom boot_signer and verity_signer.
 2015-06-09 23:28:07 +00:00
Baligh Uddin 601ddeae06 Allow custom boot_signer and verity_signer. 
Bug: 21701163
Change-Id: I85e75fd3a166a9f6a7859ebf81dee73322dc2798
 2015-06-09 15:48:14 -07:00
Luan Nguyen c4c51746cb am 18985e76: am 30b16ac6: am 95a1818f: Merge "docs: Add styles for embedded videos to match DevSite" into mnc-preview-docs 
* commit '18985e76617fefab2d9bf480c99994e1e9ba9143':
  docs: Add styles for embedded videos to match DevSite
 2015-06-05 02:50:18 +00:00
Luan Nguyen 18985e7661 am 30b16ac6: am 95a1818f: Merge "docs: Add styles for embedded videos to match DevSite" into mnc-preview-docs 
* commit '30b16ac6a4d4658d927d48476081de7542b5989f':
  docs: Add styles for embedded videos to match DevSite
 2015-06-05 02:27:29 +00:00
Tao Bao b7998ec0d5 am 726b7f33: Fix the broken signing script 
* commit '726b7f338f32ca6d18e9961b0a2da3ef385f7e34':
  Fix the broken signing script
 2015-06-04 01:34:06 +00:00