27ccb75af7
Clean up sanitizer configuration.
...
* Refactor a few pieces to avoid deeply nested conditionals.
* LOCAL_SANITIZE := never replaces LOCAL_ADDRESS_SANITIZER := false.
Change-Id: I68bb8c5edda6ecd40179c5ba9f18d06e96aaa260
2015-04-17 09:39:12 -07:00
29f529f33e
Calculate max_stashed_blocks correctly for block OTA v3
...
The updater automatically stashes overlapping source blocks to
make it possible to resume if the command performing the update
is interrupted. However, blockimgdiff.py does not take this into
account and therefore, max_stashed_blocks indicates only the
number of explicitly stashed blocks. Change blockimgdiff.py to
correctly calculate the maximum used stash space, including any
automatically stashed blocks.
Bug: 20309033
Change-Id: Ibf5cb1abc38c54e60a6ad3ce4cbce43556b08ac2
2015-04-17 16:28:08 +01:00
3456d3bbf7
am d6ba1cfd: am 35790525: am 3a5602eb: Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"
...
* commit 'd6ba1cfdfb0c1792e2f2f1de5bd2c596a41a47cc':
core_base.mk: switch to new H264 and MPEG2 software codecs
2015-04-17 06:13:31 +00:00
d6ba1cfdfb
am 35790525: am 3a5602eb: Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"
...
* commit '35790525cc756c72a44094f55970ec3b3d7e8a28':
core_base.mk: switch to new H264 and MPEG2 software codecs
2015-04-17 05:20:26 +00:00
35790525cc
am 3a5602eb: Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"
...
* commit '3a5602ebb8c365c252b6b9a6284996015d92ca33':
core_base.mk: switch to new H264 and MPEG2 software codecs
2015-04-17 05:07:58 +00:00
3a5602ebb8
Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"
2015-04-17 04:58:22 +00:00
25799ca584
doc: Add Korean version of DAC/distribute/ page.
...
Bug: 20204101
Change-Id: I1b76fe136b4e059c1af94dee8bf54d1ae764954d
2015-04-17 12:15:38 +09:00
f623a80480
core_base.mk: switch to new H264 and MPEG2 software codecs
...
Change-Id: I3078a4ef6e73e95edcdd16b087ac61ae56c4b812
2015-04-16 19:02:47 -07:00
846505dc35
Switch from Calculator to ExactCalculator
...
Bug: 20301980
Change-Id: I95373aba826a0b5d58d2845b77e9849b674c5ed3
2015-04-16 17:28:05 -07:00
6716ca263f
am 144423a0: am 9ec90ec8: am 1004eccb: Merge "Fix bookmark title"
...
* commit '144423a0580fe03a00053da785bcfdc8e46a87b5':
Fix bookmark title
2015-04-16 23:59:05 +00:00
144423a058
am 9ec90ec8: am 1004eccb: Merge "Fix bookmark title"
...
* commit '9ec90ec81347aa71eb7538c5e8354c3ffbd858e8':
Fix bookmark title
2015-04-16 23:37:23 +00:00
9ec90ec813
am 1004eccb: Merge "Fix bookmark title"
...
* commit '1004eccb166908b1411e966ca7f6fac315ad3bb0':
Fix bookmark title
2015-04-16 23:22:28 +00:00
1004eccb16
Merge "Fix bookmark title"
2015-04-16 23:12:50 +00:00
aa9fbd8232
Doc change: increment metadata for updated Distribute landing page content.
...
Change-Id: Ic45637709a72e4fff4a3a130352f48f7544c5ce2
2015-04-16 15:28:45 -07:00
1ee21944a6
Merge "Adding the new CarrierConfig app to the system image."
2015-04-16 20:13:36 +00:00
1efbc8996e
Fix bookmark title
...
Bug: 20299601
Change-Id: Ie57daf7b378cf370e34ff282d97fd36f2d74031a
2015-04-16 11:56:22 -07:00
36972044fb
am db6a4158: am 86e441fc: am 1ff61a9b: Merge "build: fs_config_generate must open file in binary mode"
...
* commit 'db6a4158fe45c1ff94fe71a94ea48ebb24c16799':
build: fs_config_generate must open file in binary mode
2015-04-16 17:53:46 +00:00
db6a4158fe
am 86e441fc: am 1ff61a9b: Merge "build: fs_config_generate must open file in binary mode"
...
* commit '86e441fc9c4191439b53b9917cf432ca2d16330a':
build: fs_config_generate must open file in binary mode
2015-04-16 17:31:36 +00:00
3dd39b092b
Adding the new CarrierConfig app to the system image.
...
Bug: b/19483786
Change-Id: I0173246997d6edddf4d9afb508a2427818f71928
2015-04-16 10:25:03 -07:00
86e441fc9c
am 1ff61a9b: Merge "build: fs_config_generate must open file in binary mode"
...
* commit '1ff61a9b2d169477b476fdf4f03a92388f3ba444':
build: fs_config_generate must open file in binary mode
2015-04-16 17:20:03 +00:00
1ff61a9b2d
Merge "build: fs_config_generate must open file in binary mode"
2015-04-16 17:07:47 +00:00
7ac7dc7263
am 8cd7e944: am fb102b1b: am 7c794b16: Merge "Revert "core_base.mk: switch to new H264 and MPEG2 software codecs""
...
* commit '8cd7e9442cfbd8247bb99c312f6e98649b3afe42':
Revert "core_base.mk: switch to new H264 and MPEG2 software codecs"
2015-04-16 16:40:35 +00:00
8cd7e9442c
am fb102b1b: am 7c794b16: Merge "Revert "core_base.mk: switch to new H264 and MPEG2 software codecs""
...
* commit 'fb102b1b5107fced1fb7cfdb98b051efb3575ec5':
Revert "core_base.mk: switch to new H264 and MPEG2 software codecs"
2015-04-16 16:19:14 +00:00
fb102b1b51
am 7c794b16: Merge "Revert "core_base.mk: switch to new H264 and MPEG2 software codecs""
...
* commit '7c794b165975c1d21753a46282dd3ea6da26fcb0':
Revert "core_base.mk: switch to new H264 and MPEG2 software codecs"
2015-04-16 16:07:37 +00:00
7c794b1659
Merge "Revert "core_base.mk: switch to new H264 and MPEG2 software codecs""
2015-04-16 15:57:02 +00:00
37e931d9c3
Revert "core_base.mk: switch to new H264 and MPEG2 software codecs"
...
clang builds fail on the dependent libraries
This reverts commit c628500ca5
2015-04-16 15:49:08 +00:00
2578431911
am ec1c2c0f: am b5f7b187: am 161c6971: Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"
...
* commit 'ec1c2c0fea5b82ecf480d32dd3679f8437f720eb':
core_base.mk: switch to new H264 and MPEG2 software codecs
2015-04-16 15:45:56 +00:00
6024069f37
build: fs_config_generate must open file in binary mode
...
Bug: 19908228
Change-Id: I2361b8af90b3729deb438e6a7a7179de12680b65
2015-04-16 08:43:33 -07:00
ec1c2c0fea
am b5f7b187: am 161c6971: Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"
...
* commit 'b5f7b18749a490a61eac66572ab1a009c608468b':
core_base.mk: switch to new H264 and MPEG2 software codecs
2015-04-16 15:24:42 +00:00
b5f7b18749
am 161c6971: Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"
...
* commit '161c69714db0a5a12ef09d85533773b7ab6152d9':
core_base.mk: switch to new H264 and MPEG2 software codecs
2015-04-16 15:13:05 +00:00
161c69714d
Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"
2015-04-16 15:02:03 +00:00
64882b50f8
Merge changes from topic 'mwd-merge-041515'
...
* changes:
am d8e3b5e..bc7fc60 from mirror-m-wireless-internal-release
am "DO NOT MERGE - Bump version to 5.1.1 automerge: 1c..."
am 5d1e929..fae98a4 from mirror-m-wireless-internal-release
am "resolved conflicts for merge of 68000907
2015-04-16 02:37:46 +00:00
a55ab6fff6
am d756e736: am c9402076: am 7a1d4d5e: Merge "fs_config: Add fs_config_generate"
...
* commit 'd756e7367ab60d5e4138d7561aaabf4256e3d247':
fs_config: Add fs_config_generate
2015-04-16 00:38:06 +00:00
d756e7367a
am c9402076: am 7a1d4d5e: Merge "fs_config: Add fs_config_generate"
...
* commit 'c9402076b65025c994c28bac0350d5b600d1d6fe':
fs_config: Add fs_config_generate
2015-04-16 00:15:47 +00:00
c9402076b6
am 7a1d4d5e: Merge "fs_config: Add fs_config_generate"
...
* commit '7a1d4d5e49a4068d8cf4fead175016c9b944c42b':
fs_config: Add fs_config_generate
2015-04-15 23:59:52 +00:00
7a1d4d5e49
Merge "fs_config: Add fs_config_generate"
2015-04-15 23:50:44 +00:00
c628500ca5
core_base.mk: switch to new H264 and MPEG2 software codecs
...
Change-Id: I86777e5efc7dbb138e9348a4ec7271ff047d328f
2015-04-15 16:18:53 -07:00
a910c7bd58
am 54c1d36e: am 5a1c89e9: am 36fb373a: Merge "fs_config: use libcutils and libselinux shared libraries"
...
* commit '54c1d36eaee59c62a652b071bdec9e71c40002ae':
fs_config: use libcutils and libselinux shared libraries
2015-04-15 22:56:22 +00:00
97952ce8ac
am 3bc25d69: am 683a387e: am 4ed95088: Merge "Add support for ubsan."
...
* commit '3bc25d69580b5cdedd834fe6accf9cc27c0fb102':
Add support for ubsan.
2015-04-15 22:56:21 +00:00
54c1d36eae
am 5a1c89e9: am 36fb373a: Merge "fs_config: use libcutils and libselinux shared libraries"
...
* commit '5a1c89e94ee4a96e31bd66f01a27c2c75cba4065':
fs_config: use libcutils and libselinux shared libraries
2015-04-15 22:40:50 +00:00
3bc25d6958
am 683a387e: am 4ed95088: Merge "Add support for ubsan."
...
* commit '683a387efb079fefd3d2895875868b7c2a5a4a06':
Add support for ubsan.
2015-04-15 22:32:08 +00:00
5a1c89e94e
am 36fb373a: Merge "fs_config: use libcutils and libselinux shared libraries"
...
* commit '36fb373adfe8bbf9397dc8ccf405fd4d6baeef2f':
fs_config: use libcutils and libselinux shared libraries
2015-04-15 22:31:26 +00:00
36fb373adf
Merge "fs_config: use libcutils and libselinux shared libraries"
2015-04-15 22:22:42 +00:00
683a387efb
am 4ed95088: Merge "Add support for ubsan."
...
* commit '4ed95088425a7de5b4fac37fff4888f0a187d5d6':
Add support for ubsan.
2015-04-15 22:21:24 +00:00
4ed9508842
Merge "Add support for ubsan."
2015-04-15 22:06:15 +00:00
87a21c8b89
resolved conflicts for merge of eec386a4 to master
...
Change-Id: Ia686e67ed480427a6422d87bef2dcd4e44e27266
2015-04-15 14:39:26 -07:00
06b91b9bcf
fs_config: Add fs_config_generate
...
fs_config_generate_$(TARGET_DEVICE) is built based off the content
of $(TARGET_ANDROID_FILESYSTEM_CONFIG_H). We also add the rules
fs_config_dirs and fs_config_file to utilize this command
for target contents:
fs_config_generate_$(TARGET_DEVICE) -D -o system/etc/fs_config_dir
fs_config_generate_$(TARGET_DEVICE) -F -o system/etc/fs_config_file
In order to use this feature, one must have the fs_config_dirs and
fs_config_files in the $(PRODUCT_PACKAGES) list defined in the
device make files in $(TARGET_DEVICE_DIR). And either an
android_filesystem_config.h file in that directory, or define a
path in TARGET_ANDROID_FILESYSTEM_CONFIG_H to point to one.
Bug: 19908228
Change-Id: Iee1543d99169f874e0915ae07962a7750ecb6342
2015-04-15 14:17:12 -07:00
073a9ebbbf
fs_config: use libcutils and libselinux shared libraries
...
- move to libcutils.so and libselinux.so as shared now that
they are in DISTTOOL.
- liblog dependency is part of libcutils, and need not be
called out explicitly now. liblog is in DISTTOOL.
- libcutils fs_config has the right to add Android logging
Bug: 19908228
Change-Id: Iaa60ad624b42d83653840ac3c77bfa03ad8674aa
2015-04-15 14:17:07 -07:00
eec386a4df
am 68dc5196: am 03c6e8c5: Merge "Move package signing after file stripping"
...
* commit '68dc5196226406db84a41a03fe70e6278ed35fcd':
Move package signing after file stripping
2015-04-15 20:12:21 +00:00
68dc519622
am 03c6e8c5: Merge "Move package signing after file stripping"
...
* commit '03c6e8c58686ffe611952d363de21b54f813ca41':
Move package signing after file stripping
2015-04-15 20:05:57 +00:00
Dan Albert