Commit Graph

21945 Commits

Author SHA1 Message Date
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 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
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 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 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
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 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 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 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
Tao Bao 1747e35a09 am a0021026: Merge "fix up ota_from_target_files symlink detection."
* commit 'a00210263efdce91c8035e34e062c67e8828c4a5':
  fix up ota_from_target_files symlink detection.
2015-07-07 17:02:47 +00:00
Tao Bao a00210263e Merge "fix up ota_from_target_files symlink detection." 2015-07-07 16:48:51 +00:00
Ying Wang 2ffb3147bc fix up ota_from_target_files symlink detection.
Change-Id: I10b668096d4e61e75473dd805f96387049f29b79
2015-07-06 14:02:01 -07:00
Tao Bao 11d4406eb9 am 48a27bcb: Merge "Fix OTA scripts to generate incremental BBOTA with OEM property."
* commit '48a27bcbb15774d0360fa344420a53cc72cd6708':
  Fix OTA scripts to generate incremental BBOTA with OEM property.
2015-07-06 16:40:49 +00:00
Tao Bao 48a27bcbb1 Merge "Fix OTA scripts to generate incremental BBOTA with OEM property." 2015-07-06 16:31:51 +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
Ying Wang 8f908ade58 am 2e26f896: Merge "Simplify LOCAL_NO_CRT."
* commit '2e26f896a65563f750f2d459d13cc8edfa705d95':
  Simplify LOCAL_NO_CRT.
2015-07-02 23:06:54 +00:00
Ying Wang 2e26f896a6 Merge "Simplify LOCAL_NO_CRT." 2015-07-02 22:59:38 +00:00
Ying Wang 491fca9809 Simplify LOCAL_NO_CRT.
Change-Id: If2486e4861071df6b225fe7f387530a38f554484
2015-07-02 15:58:34 -07:00
Elliott Hughes b661c37f4d am cd26a2dd: Merge "Remove HAVE_STDINT_H namespace pollution."
* commit 'cd26a2dd7e2be499c9eb8b3e907cb3d31b1ed5be':
  Remove HAVE_STDINT_H namespace pollution.
2015-07-02 18:58:41 +00:00
Elliott Hughes cd26a2dd7e Merge "Remove HAVE_STDINT_H namespace pollution." 2015-07-02 18:50:26 +00:00
Stephen Hines fc4930034f am b2275868: Merge "Add LOCAL_NO_LIBGCC."
* commit 'b2275868e15caef2a04f0530749cc06415ef10f6':
  Add LOCAL_NO_LIBGCC.
2015-07-02 18:45:45 +00:00
Stephen Hines b2275868e1 Merge "Add LOCAL_NO_LIBGCC." 2015-07-02 18:38:32 +00:00
Ying Wang 75011b2003 Add LOCAL_NO_LIBGCC.
This can be used to compile independent libraries without the need for
libgcc.a.

Change-Id: I924200995569d9a978ddbaa6ec321d80734f1374
2015-07-02 11:05:27 -07:00
Elliott Hughes d47e01a3a1 Remove HAVE_STDINT_H namespace pollution.
Change-Id: I1e42d1616da0f3a90f8da189d2e919f781c4eb5a
2015-07-02 10:26:53 -07:00
Ying Wang 68787b3d1e am bbaeaa58: Merge "Configure synci generation explicitly"
* commit 'bbaeaa5879c5ab380c024bd20f35e927f4d19c87':
  Configure synci generation explicitly
2015-07-02 00:38:53 +00:00
Ying Wang bbaeaa5879 Merge "Configure synci generation explicitly" 2015-07-01 18:58:52 +00:00
Evgenii Stepanov be8dd6154b am 473dfdf7: Merge "Move sanitized vendor libraries to /data/vendor/lib(|64)."
* commit '473dfdf71b984fb04ae8f60b8941d89ef5c76710':
  Move sanitized vendor libraries to /data/vendor/lib(|64).
2015-06-30 21:48:40 +00:00
Evgenii Stepanov 473dfdf71b Merge "Move sanitized vendor libraries to /data/vendor/lib(|64)." 2015-06-30 21:30:29 +00:00
Evgenii Stepanov bf140974b2 Move sanitized vendor libraries to /data/vendor/lib(|64).
Sanitized RPATH now mentions /system/vendor/lib to preserve overlay
in the case when a sanitized version of a vendor library can not be
built.

Bug: 22199458
Change-Id: I3222d2e1d6c08fdd1e0404fcb7db347aa4a92bb7
2015-06-30 14:04:45 -07:00