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
Simon Wilson
011ea06db7
Add compressor options for squashfs system images
...
Change-Id: I2a75f8754273f6e00b96ba6aca6741c4388f5da8
(cherry picked from commit f86e7eeabc
)
2015-07-07 11:41:20 -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
Tao Bao
541200792b
am f40a34fd
: Merge "Retry adjusting the size computation for reserved blocks."
...
* commit 'f40a34fd23e737b14067308700b3eef27e42d3b1':
Retry adjusting the size computation for reserved blocks.
2015-06-30 19:31:09 +00:00
Tao Bao
f40a34fd23
Merge "Retry adjusting the size computation for reserved blocks."
2015-06-30 19:19:41 +00: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
0f0af20d6d
am 5df6b5c3
: Merge "sparse_img.py: Don\'t write empty map groups."
...
* commit '5df6b5c3463bc8715510320beb7833c45371e021':
sparse_img.py: Don't write empty map groups.
2015-06-27 16:47:53 +00:00
Tao Bao
5df6b5c346
Merge "sparse_img.py: Don't write empty map groups."
2015-06-27 16:37:40 +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
4c89dc3d3e
am c94a705f
: Merge "Use fstab in the source build"
...
* commit 'c94a705f445aa7edc2a30b364b59fe8becb02f11':
Use fstab in the source build
2015-06-26 23:09:11 +00:00
Tao Bao
a629cdd393
am dd77b561
: Merge "Support SELinux context label when mounting"
...
* commit 'dd77b561e5e6da3bb595505af625f69ca9f3943b':
Support SELinux context label when mounting
2015-06-26 23:09:08 +00: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