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

23885 Commits

Author SHA1 Message Date
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
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
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 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 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 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 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 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 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 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
Thierry Strudel a69dcefda3 am 74a81e66: fix device specific fs_config on build server 
* commit '74a81e6633276d92337749a5ee9d921207814dd4':
  fix device specific fs_config on build server
 2015-07-10 18:57:38 +00:00
Thierry Strudel 74a81e6633 fix device specific fs_config on build server 
fs_config function from libcutils, in order to properly set the xattr FS
used to define device specific uid, gid, permissions and capabilities,
now needs TARGET_OUT make variable to be passed explicitly to all tools
using it:
  fs_config
  fs_get_stats used by mktarball.sh
  make_ext4fs used by mkuserimg.sh
  mksquashfs used by mksquashfsimage.sh

Bug: 21989305
Bug: 22048934
Change-Id: I6caf9cf870882fce2ead93027767092c29b75ded
Signed-off-by: Thierry Strudel <tstrudel@google.com>
 2015-07-10 10:55:54 -07:00
Elliott Hughes aeb45c6faf am b211c8cf: am 76eaa968: Merge "Remove HAVE_WIN32_IPC." 
* commit 'b211c8cf0994992f521f3406c3a173f64bf4fe0a':
  Remove HAVE_WIN32_IPC.
 2015-07-09 18:39:32 +00:00
Elliott Hughes b211c8cf09 am 76eaa968: Merge "Remove HAVE_WIN32_IPC." 
* commit '76eaa96875d5aac8d5141095e9e345a9ff84d814':
  Remove HAVE_WIN32_IPC.
 2015-07-09 17:50:52 +00:00
Elliott Hughes 76eaa96875 Merge "Remove HAVE_WIN32_IPC." 2015-07-09 17:30:16 +00:00
Elliott Hughes ba2f676410 Remove HAVE_WIN32_IPC. 
Change-Id: I6c01ed5b059c230d7382dc6158103f31d4bf9dbb
 2015-07-09 10:20:13 -07:00
Elliott Hughes da4c9d2fa5 am 9ba0796e: am 60dda9c4: Merge "Remove mkbootimg from the pathmap." 
* commit '9ba0796e37f38b40eb2182c2d277a2b272169342':
  Remove mkbootimg from the pathmap.
 2015-07-08 23:39:23 +00:00
Elliott Hughes 5433b577ce am 7a4a9296: am fd5692b3: Merge "Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h." 
* commit '7a4a9296217932e78e9c7260167ac968ef86baf8':
  Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h.
 2015-07-08 23:39:19 +00:00
Elliott Hughes 9ba0796e37 am 60dda9c4: Merge "Remove mkbootimg from the pathmap." 
* commit '60dda9c44dfef577d8f95784c1554696882d83f7':
  Remove mkbootimg from the pathmap.
 2015-07-08 23:22:45 +00:00
Elliott Hughes 7a4a929621 am fd5692b3: Merge "Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h." 
* commit 'fd5692b32c88306cfc800bdffb10a277d9cb080a':
  Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h.
 2015-07-08 23:22:44 +00:00
Elliott Hughes 60dda9c44d Merge "Remove mkbootimg from the pathmap." 2015-07-08 23:13:32 +00:00
Elliott Hughes fd5692b32c Merge "Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h." 2015-07-08 23:11:18 +00:00
Elliott Hughes 3d949bbabc Remove mkbootimg from the pathmap. 
It's only ever referred to directly. (Should probably move to
system/core/include, but that's orthogonal to this change.)

Change-Id: I353afff031a29206aaa5a0991fe0ccb39e4731e2
 2015-07-08 16:05:17 -07:00
Elliott Hughes b443d3a979 am a78f5557: am 8f548f35: Merge "Remove pathmap.mk entries for libc." 
* commit 'a78f5557709ec7a2b9b1bf598b0b401a5b50e6ef':
  Remove pathmap.mk entries for libc.
 2015-07-08 21:49:07 +00:00
Elliott Hughes a78f555770 am 8f548f35: Merge "Remove pathmap.mk entries for libc." 
* commit '8f548f35d6c01c9dea76da885165e40aa10151f9':
  Remove pathmap.mk entries for libc.
 2015-07-08 21:34:53 +00:00
Elliott Hughes 8f548f35d6 Merge "Remove pathmap.mk entries for libc." 2015-07-08 21:19:59 +00:00
Elliott Hughes b248bf85ae Remove pathmap.mk entries for libc. 
Change-Id: I9f4ce70696dd7df5922b3c80501fac9c7d4b7149
 2015-07-08 14:10:23 -07:00
Elliott Hughes 5dbf4eab72 Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h. 
Change-Id: If1cd88ee14bf9cbb4a0a1f608b0d015c9181c2c2
 2015-07-08 13:12:38 -07:00
Tao Bao 72935566aa am 38a534b6: resolved conflicts for merge of 610754e5 to cw-e-dev 
* commit '38a534b6939630039d0c78c2f9f20dd8fde64c85':
  Scan all init.*.rc files for flash_recovery service.
 2015-07-08 18:14:10 +00:00
Tao Bao b8fbf8a2a1 am 74008203: am e246964b: Merge "Scan all init.*.rc files for flash_recovery service." 
* commit '7400820330b39bc5d044c6f9c46d06a7650c83f1':
  Scan all init.*.rc files for flash_recovery service.
 2015-07-08 17:52:33 +00:00
Tao Bao 38a534b693 resolved conflicts for merge of 610754e5 to cw-e-dev 
Change-Id: Ia0d0d82c7fec86e1585a9e2c90ac877c363ed491
 2015-07-08 10:43:31 -07:00
Tao Bao 7400820330 am e246964b: Merge "Scan all init.*.rc files for flash_recovery service." 
* commit 'e246964b8f73056015379ff37ff746f549c0f20d':
  Scan all init.*.rc files for flash_recovery service.
 2015-07-08 17:39:02 +00:00
Tao Bao e246964b8f Merge "Scan all init.*.rc files for flash_recovery service." 2015-07-08 17:22:36 +00:00
Tao Bao 9f0c8dfaf1 Scan all init.*.rc files for flash_recovery service. 
Clockwork builds may rename init.rc to init.core.rc. Change the OTA
script to scan all init.*.rc files to determine the proper location for
install-recovery.sh.

Bug: 22128990
Change-Id: Icad3497d1663e074b938919b40fc239c84fbeb2b
(cherry picked from commit 610754e5ad)
 2015-07-08 10:20:39 -07:00
Dirk Dougherty bb7d32ad48 am 26b3ec5a: am 0da02191: am aee6585c: Update js/css versions and add pt-br. 
* commit '26b3ec5a689f187b3174d1f774d40d879730b729':
  Update js/css versions and add pt-br.
 2015-07-08 12:55:32 +00:00
Dirk Dougherty 927d13d738 am bb18cb1a: am 4187cee6: am 0b9e204d: Support matching unicode characters in suggestions by changing match(regex) to indexOf(string). 
* commit 'bb18cb1a0ca335d9bb52bb7b589945a1027cc6cf':
  Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
 2015-07-08 12:55:13 +00:00
Dirk Dougherty 26b3ec5a68 am 0da02191: am aee6585c: Update js/css versions and add pt-br. 
* commit '0da02191ccc2030a3b4ac81500fdcabb72570049':
  Update js/css versions and add pt-br.
 2015-07-08 11:44:24 +00:00