Sami Tolvanen
586b38cc39
Merge "Calculate max_stashed_blocks correctly for block OTA v3"
2015-04-17 18:43:51 +00:00
Dmitriy Ivanov
8f9487431c
Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
...
Use LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES instead.
Change-Id: Id30529fbc1652d066e0008813352848b5e404ab9
2015-04-17 11:39:04 -07:00
Dan Albert
b5b2ffe3be
Add support for a partial ubsan build.
...
Some of the ubsan checks expose a few pathological performance cases
in clang, and thus aren't suited to be used in SANITIZE_HOST.
This mode is also supported on the target despite not having the
target runtime libraries for ubsan by generating traps.
Change-Id: I0b0f0a08ca84d72e44e2174a66726b1c5e5cad7e
2015-04-17 11:37:03 -07:00
Dan Albert
1d8f780c7d
Merge "Fix misuse of my_sanitize_host."
2015-04-17 18:33:40 +00:00
Dan Albert
6ed5bea46f
Merge "Make use of sanitizers without clang an error."
2015-04-17 18:33:23 +00:00
Dan Albert
4c92a68127
Fix misuse of my_sanitize_host.
...
Ying pointed out in https://android-review.googlesource.com/#/c/147290
that my_sanitize_host would be read as some garbage value for target
builds. Move the configuration later and don't use the local at all.
Change-Id: Id8a095821d000a184e72f950b9481597073a7044
2015-04-17 11:32:57 -07:00
Dan Albert
94b579166f
Make use of sanitizers without clang an error.
...
Previously using a sanitizer would imply clang. It should be an error
instead so it's more obvious.
Change-Id: I67c949bfda3718a0d19da7e358b5fde447fce334
2015-04-17 11:06:24 -07:00
Dan Albert
f52cf64f6c
am fad70977
: am cf6e1ff6
: am 27176208
: Merge "Clean up sanitizer configuration."
...
* commit 'fad709772e766ce83b4667e89a25a7f0d90ca5f8':
Clean up sanitizer configuration.
2015-04-17 17:32:23 +00:00
Dan Albert
fad709772e
am cf6e1ff6
: am 27176208
: Merge "Clean up sanitizer configuration."
...
* commit 'cf6e1ff62a0abbea186d5a62f23d0b71671202ca':
Clean up sanitizer configuration.
2015-04-17 17:08:55 +00:00
Dan Albert
cf6e1ff62a
am 27176208
: Merge "Clean up sanitizer configuration."
...
* commit '2717620873fa1936779662a96de05033b89ddb19':
Clean up sanitizer configuration.
2015-04-17 16:57:54 +00:00
Dan Albert
2717620873
Merge "Clean up sanitizer configuration."
2015-04-17 16:47:01 +00:00
Dan Albert
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
Sami Tolvanen
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
Lajos Molnar
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
Lajos Molnar
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
Lajos Molnar
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
Lajos Molnar
3a5602ebb8
Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"
2015-04-17 04:58:22 +00:00
Ryosuke Matsuuchi
25799ca584
doc: Add Korean version of DAC/distribute/ page.
...
Bug: 20204101
Change-Id: I1b76fe136b4e059c1af94dee8bf54d1ae764954d
2015-04-17 12:15:38 +09:00
Lajos Molnar
f623a80480
core_base.mk: switch to new H264 and MPEG2 software codecs
...
Change-Id: I3078a4ef6e73e95edcdd16b087ac61ae56c4b812
2015-04-16 19:02:47 -07:00
Justin Klaassen
846505dc35
Switch from Calculator to ExactCalculator
...
Bug: 20301980
Change-Id: I95373aba826a0b5d58d2845b77e9849b674c5ed3
2015-04-16 17:28:05 -07:00
Glenn Kasten
6716ca263f
am 144423a0
: am 9ec90ec8
: am 1004eccb
: Merge "Fix bookmark title"
...
* commit '144423a0580fe03a00053da785bcfdc8e46a87b5':
Fix bookmark title
2015-04-16 23:59:05 +00:00
Glenn Kasten
144423a058
am 9ec90ec8
: am 1004eccb
: Merge "Fix bookmark title"
...
* commit '9ec90ec81347aa71eb7538c5e8354c3ffbd858e8':
Fix bookmark title
2015-04-16 23:37:23 +00:00
Glenn Kasten
9ec90ec813
am 1004eccb
: Merge "Fix bookmark title"
...
* commit '1004eccb166908b1411e966ca7f6fac315ad3bb0':
Fix bookmark title
2015-04-16 23:22:28 +00:00
Glenn Kasten
1004eccb16
Merge "Fix bookmark title"
2015-04-16 23:12:50 +00:00
Dirk Dougherty
aa9fbd8232
Doc change: increment metadata for updated Distribute landing page content.
...
Change-Id: Ic45637709a72e4fff4a3a130352f48f7544c5ce2
2015-04-16 15:28:45 -07:00
Junda Liu
1ee21944a6
Merge "Adding the new CarrierConfig app to the system image."
2015-04-16 20:13:36 +00:00
Glenn Kasten
1efbc8996e
Fix bookmark title
...
Bug: 20299601
Change-Id: Ie57daf7b378cf370e34ff282d97fd36f2d74031a
2015-04-16 11:56:22 -07:00
Mark Salyzyn
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
Mark Salyzyn
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
Jonathan Basseri
3dd39b092b
Adding the new CarrierConfig app to the system image.
...
Bug: b/19483786
Change-Id: I0173246997d6edddf4d9afb508a2427818f71928
2015-04-16 10:25:03 -07:00
Mark Salyzyn
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
Mark Salyzyn
1ff61a9b2d
Merge "build: fs_config_generate must open file in binary mode"
2015-04-16 17:07:47 +00:00
Lajos Molnar
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
Lajos Molnar
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
Lajos Molnar
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
Lajos Molnar
7c794b1659
Merge "Revert "core_base.mk: switch to new H264 and MPEG2 software codecs""
2015-04-16 15:57:02 +00:00
Lajos Molnar
37e931d9c3
Revert "core_base.mk: switch to new H264 and MPEG2 software codecs"
...
clang builds fail on the dependent libraries
This reverts commit c628500ca5
.
Change-Id: Ibd4cdce82b890bd3cb9d03a1a1bc0e4fc0e22ee8
2015-04-16 15:49:08 +00:00
Lajos Molnar
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
Mark Salyzyn
6024069f37
build: fs_config_generate must open file in binary mode
...
Bug: 19908228
Change-Id: I2361b8af90b3729deb438e6a7a7179de12680b65
2015-04-16 08:43:33 -07:00
Lajos Molnar
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
Lajos Molnar
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
Lajos Molnar
161c69714d
Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"
2015-04-16 15:02:03 +00:00
Vinit Deshpande
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
to lmp-mr..."
am bcfe6fa..7d5716e from mirror-m-wireless-internal-release
2015-04-16 02:37:46 +00:00
Mark Salyzyn
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
Mark Salyzyn
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
Mark Salyzyn
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
Mark Salyzyn
7a1d4d5e49
Merge "fs_config: Add fs_config_generate"
2015-04-15 23:50:44 +00:00
Lajos Molnar
c628500ca5
core_base.mk: switch to new H264 and MPEG2 software codecs
...
Change-Id: I86777e5efc7dbb138e9348a4ec7271ff047d328f
2015-04-15 16:18:53 -07:00
Mark Salyzyn
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
Dan Albert
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