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

24188 Commits

Author SHA1 Message Date
Tao Bao 4f7a7ead37 am 6cc282c1: am 0d4a9405: am ecb7b37b: Merge "Assert the stash size when generating OTAs." 
* commit '6cc282c10ac60beb1c06b1fdd2f9db1e2b9ba9f5':
  Assert the stash size when generating OTAs.
 2015-07-14 21:04:20 +00:00
Evgenii Stepanov 2e00221ef5 am db511b80: am e7171190: am 832fa5d7: Merge "Disable detection of bugs on global variables." 
* commit 'db511b80760a6adb1758f3e34c05f01ab860cd70':
  Disable detection of bugs on global variables.
 2015-07-14 21:04:18 +00:00
Tao Bao 6cc282c10a am 0d4a9405: am ecb7b37b: Merge "Assert the stash size when generating OTAs." 
* commit '0d4a9405938210618bb305e33285f555daf2fb5d':
  Assert the stash size when generating OTAs.
 2015-07-14 20:53:40 +00:00
Evgenii Stepanov db511b8076 am e7171190: am 832fa5d7: Merge "Disable detection of bugs on global variables." 
* commit 'e71711901f5395de5af64724a9d254173b298108':
  Disable detection of bugs on global variables.
 2015-07-14 20:46:19 +00:00
Tao Bao 0d4a940593 am ecb7b37b: Merge "Assert the stash size when generating OTAs." 
* commit 'ecb7b37be27e1d7eda5c5aca67c59b88591b9530':
  Assert the stash size when generating OTAs.
 2015-07-14 20:45:55 +00:00
Tao Bao ecb7b37be2 Merge "Assert the stash size when generating OTAs." 2015-07-14 20:37:50 +00:00
Tao Bao 8dcf738234 Assert the stash size when generating OTAs. 
With block-based OTA v2 and v3, it requires stash space on the /cache
partition to back up blocks during an update. We need to ensure that
it doesn't exceed the partition size. Since there might be other files
on /cache as well, we use cache_size * threshold as the maximum allowed
size. The threshold defaults to 0.8, which can be overridden by command
line option '--stash_threshold'.

Change-Id: I5c2e353ea4716328d6cdc6a7f758520de8d88b8e
(cherry picked from commit 23ac404212)
 2015-07-14 13:36:50 -07:00
Tao Bao 23ac404212 Assert the stash size when generating OTAs. 
With block-based OTA v2 and v3, it requires stash space on the /cache
partition to back up blocks during an update. We need to ensure that
it doesn't exceed the partition size. Since there might be other files
on /cache as well, we use cache_size * threshold as the maximum allowed
size. The threshold defaults to 0.8, which can be overridden by command
line option '--stash_threshold'.

Change-Id: I1cce54b82280f803d626a69a087f706343d94bc7
 2015-07-14 13:11:49 -07:00
Evgenii Stepanov e71711901f am 832fa5d7: Merge "Disable detection of bugs on global variables." 
* commit '832fa5d7146a28a52f2c4f5f38f981f1e858ec8a':
  Disable detection of bugs on global variables.
 2015-07-14 18:13:20 +00:00
Evgenii Stepanov 832fa5d714 Merge "Disable detection of bugs on global variables." 2015-07-14 18:03:03 +00:00
Thierry Strudel 312d1de1bf am b654458f: am 7f798c6c: am 8d7066c1: am 6b74f21a: oem_image/custom_image: fix missing new parameter to build_image.py 
* commit 'b654458ff78a420ca0f5e277cc70737bfb851639':
  oem_image/custom_image: fix missing new parameter to build_image.py
 2015-07-14 16:41:53 +00:00
Thierry Strudel b654458ff7 am 7f798c6c: am 8d7066c1: am 6b74f21a: oem_image/custom_image: fix missing new parameter to build_image.py 
* commit '7f798c6c3192cd017931c638abde9a39e449e3c8':
  oem_image/custom_image: fix missing new parameter to build_image.py
 2015-07-14 16:25:02 +00:00
Tao Bao c8a5cff7df am afd02397: Merge "Revert "Temporarily use blockimgdiff v2 for OTA."" into mnc-dr-dev-plus-aosp 
* commit 'afd02397bf4e793f3c068728926eb3806435c3dc':
  Revert "Temporarily use blockimgdiff v2 for OTA."
 2015-07-14 12:01:10 +00:00
Paul Crowley 620e681906 am e821d139: am 460a5abb: am 70198185: Merge "Build "secdiscard" for securely discarding data from flash devices." into mnc-dr-dev 
* commit 'e821d139ce73aeabbd3f39dcaeb4f37ff037e92b':
  Build "secdiscard" for securely discarding data from flash devices.
 2015-07-14 12:00:57 +00:00
Evgenii Stepanov ff7a781512 Disable detection of bugs on global variables. 
This is a temporary change pending code cleanup.

We are already disabling detection of ODR violations. As it turns out,
an ODR between an ASan-instrumented library and a non-instrumented library
may actually crash ASan, and there is no obvious way out, and one of those
prevents us from booting a SANITIZE_TARGET image right now.

Bug: 21951850
Change-Id: I49508242ec96089a3d4d8b7e45f36323d62f2be9
 2015-07-13 20:03:02 -07:00
Tao Bao afd02397bf Merge "Revert "Temporarily use blockimgdiff v2 for OTA."" into mnc-dr-dev-plus-aosp 2015-07-14 01:10:18 +00:00
Paul Crowley e821d139ce am 460a5abb: am 70198185: Merge "Build "secdiscard" for securely discarding data from flash devices." into mnc-dr-dev 
* commit '460a5abbee35836f152a9be2fe11664e7bfa5432':
  Build "secdiscard" for securely discarding data from flash devices.
 2015-07-14 00:02:42 +00:00
Tao Bao 358da0c015 Revert "Temporarily use blockimgdiff v2 for OTA." 
The workround should stay in mnc-dr-dev branch only.

This reverts commit d07bfc5196.

Change-Id: If8d2d88d50e87f031ed6df44b01a1e9e38a7f97f
 2015-07-13 17:00:04 -07:00
Thierry Strudel 7f798c6c31 am 8d7066c1: am 6b74f21a: oem_image/custom_image: fix missing new parameter to build_image.py 
* commit '8d7066c148cb1a2ed3c1b3f41cafda36a4efe2d2':
  oem_image/custom_image: fix missing new parameter to build_image.py
 2015-07-13 23:48:39 +00:00
Thierry Strudel 8d7066c148 am 6b74f21a: oem_image/custom_image: fix missing new parameter to build_image.py 
* commit '6b74f21a4d3ff7ed7bb8463210263e9ecb27830a':
  oem_image/custom_image: fix missing new parameter to build_image.py
 2015-07-13 23:31:15 +00:00
Paul Crowley 460a5abbee am 70198185: Merge "Build "secdiscard" for securely discarding data from flash devices." into mnc-dr-dev 
* commit '701981851110d6931195a5898c521bf8cdab2bae':
  Build "secdiscard" for securely discarding data from flash devices.
 2015-07-13 22:34:44 +00:00
Thierry Strudel 6b74f21a4d oem_image/custom_image: fix missing new parameter to build_image.py 
Bug: 22441494
Change-Id: I0baa4db67ab7a17dc89193511702ed98e7515318
Signed-off-by: Thierry Strudel <tstrudel@google.com>
 2015-07-13 14:46:49 -07:00
Paul Crowley 7019818511 Merge "Build "secdiscard" for securely discarding data from flash devices." into mnc-dr-dev 2015-07-13 20:54:43 +00:00
Tao Bao 4fe76314a4 am 23130059: am 0e66c70d: am d07bfc51: Temporarily use blockimgdiff v2 for OTA. 
* commit '2313005918153ad466e64d7371c92417d0433624':
  Temporarily use blockimgdiff v2 for OTA.
 2015-07-13 16:15:55 +00:00
Tao Bao 2313005918 am 0e66c70d: am d07bfc51: Temporarily use blockimgdiff v2 for OTA. 
* commit '0e66c70d0185f24df3e4af984f269f1263766af4':
  Temporarily use blockimgdiff v2 for OTA.
 2015-07-13 15:57:02 +00:00
Tao Bao 0e66c70d01 am d07bfc51: Temporarily use blockimgdiff v2 for OTA. 
* commit 'd07bfc519673fdba66448f0a81ef869b922c3804':
  Temporarily use blockimgdiff v2 for OTA.
 2015-07-13 15:11:36 +00:00
Tao Bao d07bfc5196 Temporarily use blockimgdiff v2 for OTA. 
angler and bullhead have smaller cache partiton (~100MB) and hit issue
with incremental OTA (such as MDA09B to MDA12) that requires more stash
space with BBOTA v3. Temporarily use v2 as a workaround, until we come
up with a real fix. Note that BBOTA v2 still uses some stash space, but
should be much smaller than v3.

Bug: 22430577
Change-Id: Ic4c05f3609732e7d5140703062da9fe11df5c6d3
 2015-07-12 23:45:24 -07:00
Tao Bao f76f0f81a7 am 906550f2: am bf8e85ab: am 2e4dd9ab: Merge "Fix the permission in common.ZipWriteStr()." 
* commit '906550f2858fdfb18eff99571c2e95824f2e9b47':
  Fix the permission in common.ZipWriteStr().
 2015-07-11 02:14:21 +00:00
Tao Bao 906550f285 am bf8e85ab: am 2e4dd9ab: Merge "Fix the permission in common.ZipWriteStr()." 
* commit 'bf8e85abb59daf676bc213623a906b8d00a65790':
  Fix the permission in common.ZipWriteStr().
 2015-07-11 02:04:05 +00:00
Tao Bao bf8e85abb5 am 2e4dd9ab: Merge "Fix the permission in common.ZipWriteStr()." 
* commit '2e4dd9ab2635f6a22df407ae1ee4dc16e0601102':
  Fix the permission in common.ZipWriteStr().
 2015-07-11 01:11:43 +00:00
Tao Bao 2e4dd9ab26 Merge "Fix the permission in common.ZipWriteStr()." 2015-07-11 00:58:32 +00:00
Tao Bao 2a410587e8 Fix the permission in common.ZipWriteStr(). 
common.ZipWriteStr() should set a default file permission to 0o100644
instead of 0o644.

Change-Id: I8c89d8442b095b56ad3a0d47afdfa73ce55ad0c8
 2015-07-10 17:45:09 -07:00
Tao Bao 3803c8df20 am 6a7d8fce: am 03125de6: am c8812493: Merge "Pack file_contexts into target_files zip." 
* commit '6a7d8fced3e5c9f731cf8e20ff327f2424f7cdd7':
  Pack file_contexts into target_files zip.
 2015-07-10 22:10:33 +00:00
Tao Bao 6a7d8fced3 am 03125de6: am c8812493: Merge "Pack file_contexts into target_files zip." 
* commit '03125de6b57fc358e14cbcd1798cdf9d3289b72f':
  Pack file_contexts into target_files zip.
 2015-07-10 21:56:22 +00:00
Tao Bao 2ba899a09f am bb657cf3: am d2e77d6e: am 7f8ecb7f: Merge "Zero out blocks that may be touched by dm-verity." into mnc-dev 
* commit 'bb657cf31c084e1d2c5bcf8cc74a7c25634cc8a3':
  Zero out blocks that may be touched by dm-verity.
 2015-07-10 21:56:06 +00:00
Tao Bao bb657cf31c am d2e77d6e: am 7f8ecb7f: Merge "Zero out blocks that may be touched by dm-verity." into mnc-dev 
* commit 'd2e77d6ec57cffe78002eb16664370318399d5f9':
  Zero out blocks that may be touched by dm-verity.
 2015-07-10 21:45:31 +00:00
Tao Bao 1757ef03f8 am ca87c735: am 46b1b205: am da724f7a: Merge "Zero out blocks that may be touched by dm-verity." 
* commit 'ca87c735a320d2a85bf8558d235fa8c808a1da7d':
  Zero out blocks that may be touched by dm-verity.
 2015-07-10 21:43:34 +00:00
Tao Bao 03125de6b5 am c8812493: Merge "Pack file_contexts into target_files zip." 
* commit 'c881249354d9a847b09d314fd1a64bbab122f0fa':
  Pack file_contexts into target_files zip.
 2015-07-10 21:41:12 +00:00
Tao Bao c881249354 Merge "Pack file_contexts into target_files zip." 2015-07-10 21:21:54 +00:00
Tao Bao 2c15d9eefe Pack file_contexts into target_files zip. 
file_contexts (specified by SELINUX_FC) is needed both when building
and (re)packaging. We used to use the copy in out/ when building, and
looked for the copy in BOOT/RAMDISK/ when packaging from target_files
zip. With system_root_image enabled, the file_contexts needed for
building and packaging might be different from the one on device. So
we explicitly pack the file as META/file_contexts in target_files zip.

Also refactor out the overriding of selinux_fc property into
common.LoadInfoDict().

Change-Id: I94f9ea6671b3792c12c1c21573840743d63da39a
(cherry picked from commit aa7318c384)
 2015-07-10 14:21:16 -07:00
Tao Bao 4795521c7d Merge "Pack file_contexts into target_files zip." 2015-07-10 21:16:41 +00:00
Tao Bao ca87c735a3 am 46b1b205: am da724f7a: Merge "Zero out blocks that may be touched by dm-verity." 
* commit '46b1b2057d5700a03b3fa6e332a737a0ef2425ba':
  Zero out blocks that may be touched by dm-verity.
 2015-07-10 21:16:20 +00:00
Tao Bao d2e77d6ec5 am 7f8ecb7f: Merge "Zero out blocks that may be touched by dm-verity." into mnc-dev 
* commit '7f8ecb7f5c21630a75c69d170ba2b401d7a311a5':
  Zero out blocks that may be touched by dm-verity.
 2015-07-10 21:09:40 +00:00
Tao Bao 46b1b2057d am da724f7a: Merge "Zero out blocks that may be touched by dm-verity." 
* commit 'da724f7a630abc122f8eae042264ee81cf1450c4':
  Zero out blocks that may be touched by dm-verity.
 2015-07-10 21:01:54 +00:00
Tao Bao da724f7a63 Merge "Zero out blocks that may be touched by dm-verity." 2015-07-10 20:51:34 +00:00
Tao Bao e9b619108d Zero out blocks that may be touched by dm-verity. 
dm-verity may touch some blocks that are not in the care_map due to
block device read-ahead. It will fail if such blocks contain
non-zeroes. As a workaround, we mark them as extended blocks and
zero out explicitly to avoid dm-verity failures.

Bug: 20881595
Change-Id: Id097138bfd065c84eac088b3ad49758010b2927b
(cherry picked from commit 2fd2c9bfd6)
 2015-07-10 13:50:24 -07:00
Tao Bao 7f8ecb7f5c Merge "Zero out blocks that may be touched by dm-verity." into mnc-dev 2015-07-10 20:44:25 +00:00
Thierry Strudel 746318b599 am 4ec1abca: am a69dcefd: am 74a81e66: fix device specific fs_config on build server 
* commit '4ec1abca847213fa8347f41a33bd79b4d689a57a':
  fix device specific fs_config on build server
 2015-07-10 19:39:56 +00:00
Thierry Strudel 4ec1abca84 am a69dcefd: am 74a81e66: fix device specific fs_config on build server 
* commit 'a69dcefda3ec493216f401117417d86f8ef757ac':
  fix device specific fs_config on build server
 2015-07-10 19:26:24 +00:00
Tao Bao 2fd2c9bfd6 Zero out blocks that may be touched by dm-verity. 
dm-verity may touch some blocks that are not in the care_map due to
block device read-ahead. It will fail if such blocks contain
non-zeroes. As a workaround, we mark them as extended blocks and
zero out explicitly to avoid dm-verity failures.

Bug: 20881595
Change-Id: I54e24e70ad822c0d6d7af43301f74d24505f4461
 2015-07-10 12:16:56 -07:00