Commit graph

23891 commits

Author SHA1 Message Date
Nick Kralevich
41da3d1209 am abbf8eeb: am a521a37d: Merge "mgrep: add output to environment commands"
* commit 'abbf8eeb674b1a9d9b8ac1cc8744f03144c3968c':
  mgrep: add output to environment commands
2015-07-15 21:27:43 +00:00
Evgenii Stepanov
436a2fb9e3 am 275e3c8c: am 2d0ec893: Merge "Use a different linker for ASan binaries."
* commit '275e3c8c105e5702b25868f80983c82c668e5664':
  Use a different linker for ASan binaries.
2015-07-15 21:27:42 +00:00
Nick Kralevich
abbf8eeb67 am a521a37d: Merge "mgrep: add output to environment commands"
* commit 'a521a37da9214ecc6400b7caf00b76869b1dc741':
  mgrep: add output to environment commands
2015-07-15 20:06:00 +00:00
Nick Kralevich
a521a37da9 Merge "mgrep: add output to environment commands" 2015-07-15 19:54:04 +00:00
Evgenii Stepanov
275e3c8c10 am 2d0ec893: Merge "Use a different linker for ASan binaries."
* commit '2d0ec89357e29138abc28f65876e4aaa208f961c':
  Use a different linker for ASan binaries.
2015-07-15 19:43:45 +00:00
Evgenii Stepanov
2d0ec89357 Merge "Use a different linker for ASan binaries." 2015-07-15 19:34:06 +00:00
Tao Bao
2ad55edfd6 am 0d4a9405: am ecb7b37b: Merge "Assert the stash size when generating OTAs."
* commit '0d4a9405938210618bb305e33285f555daf2fb5d':
  Assert the stash size when generating OTAs.
2015-07-14 23:07:15 +00:00
Evgenii Stepanov
8412763bc6 am e7171190: am 832fa5d7: Merge "Disable detection of bugs on global variables."
* commit 'e71711901f5395de5af64724a9d254173b298108':
  Disable detection of bugs on global variables.
2015-07-14 23:06:51 +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
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
8f5e67a98c Use a different linker for ASan binaries.
Another change in bionic/linker adds linker_asan/linker_asan64 that
know where to find ASan shared libraries.
Also, include linker_asan to the required packages list when building
for ASan.

Change-Id: I8ebe7c0091bbeb0c135708a891d33d9844373d37
2015-07-14 11:10:40 -07:00
Evgenii Stepanov
832fa5d714 Merge "Disable detection of bugs on global variables." 2015-07-14 18:03:03 +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
Thierry Strudel
533829a5dd 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:56:00 +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
William Roberts
23a298b190 mgrep: add output to environment commands
Change-Id: I7a97e00c7ef5ac179333303d89511c2f72cbd100
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2015-07-13 09:29:52 -07:00
Tao Bao
71404b8102 am bf8e85ab: am 2e4dd9ab: Merge "Fix the permission in common.ZipWriteStr()."
* commit 'bf8e85abb59daf676bc213623a906b8d00a65790':
  Fix the permission in common.ZipWriteStr().
2015-07-11 01:39:49 +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
e7a4b429d2 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:02 +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
0d14a397db 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:15:34 +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
89832b36af 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 20:55:39 +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
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
f4e503774e am 74a81e66: fix device specific fs_config on build server
* commit '74a81e6633276d92337749a5ee9d921207814dd4':
  fix device specific fs_config on build server
2015-07-10 18:44:53 +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
32fd6c9a03 am b211c8cf: am 76eaa968: Merge "Remove HAVE_WIN32_IPC."
* commit 'b211c8cf0994992f521f3406c3a173f64bf4fe0a':
  Remove HAVE_WIN32_IPC.
2015-07-09 18:39:25 +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
ab944482b8 am 9ba0796e: am 60dda9c4: Merge "Remove mkbootimg from the pathmap."
* commit '9ba0796e37f38b40eb2182c2d277a2b272169342':
  Remove mkbootimg from the pathmap.
2015-07-08 23:41:35 +00:00
Elliott Hughes
b9bdda3aff 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:41:34 +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
b6e9ed6f2b am a78f5557: am 8f548f35: Merge "Remove pathmap.mk entries for libc."
* commit 'a78f5557709ec7a2b9b1bf598b0b401a5b50e6ef':
  Remove pathmap.mk entries for libc.
2015-07-08 21:49:40 +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