OSDN Git Service
Dimitry Ivanov [Wed, 29 Apr 2015 19:26:28 +0000 (19:26 +0000)]
am
b7550093: Merge "Revert "Pack relocations for mips""
* commit '
b755009325c9c2b1e9651a53f548d206a0c8d2c3':
Revert "Pack relocations for mips"
Dimitry Ivanov [Wed, 29 Apr 2015 19:11:05 +0000 (19:11 +0000)]
Merge "Revert "Pack relocations for mips""
Nick Kralevich [Wed, 29 Apr 2015 19:12:44 +0000 (19:12 +0000)]
am
37ddcad5: Merge "Define BOARD_SEPOLICY_DIRS for 64-bit emulators."
* commit '
37ddcad5a7074d26ef8392714d332a133267c568':
Define BOARD_SEPOLICY_DIRS for 64-bit emulators.
Dimitry Ivanov [Wed, 29 Apr 2015 19:12:43 +0000 (19:12 +0000)]
am
dcf8bd8c: Merge "Revert "Pack relocations for mips64""
* commit '
dcf8bd8c0770b3e60342cce3683a7816b6224ae6':
Revert "Pack relocations for mips64"
Nick Kralevich [Wed, 29 Apr 2015 19:07:00 +0000 (19:07 +0000)]
Merge "Define BOARD_SEPOLICY_DIRS for 64-bit emulators."
Dimitry Ivanov [Wed, 29 Apr 2015 19:03:56 +0000 (19:03 +0000)]
Merge "Revert "Pack relocations for mips64""
Dimitry Ivanov [Wed, 29 Apr 2015 18:59:05 +0000 (18:59 +0000)]
Revert "Pack relocations for mips64"
This reverts commit
8bd30fe3cb82e50caab50e4091c5977e5e24db0e.
Bug: http://b/
20658994
Change-Id: I6c31094559a12b824344802bf3993f91aee79a26
Dimitry Ivanov [Wed, 29 Apr 2015 18:57:54 +0000 (18:57 +0000)]
Revert "Pack relocations for mips"
This reverts commit
9dc1a7359f2351e18f08d69ea725f884541b2f2f.
Bug: http://b/
20658994
Change-Id: Ib10c764a7d06db823ee2fccfa47240e0a639d4bc
Stephen Smalley [Wed, 29 Apr 2015 13:55:08 +0000 (09:55 -0400)]
Define BOARD_SEPOLICY_DIRS for 64-bit emulators.
Define BOARD_SEPOLICY_DIRS for the arm64, mips64, and x86_64
emulator targets. As a first cut, simply inherit from the
existing policy directories used for generic and generic_x86.
We may need further board-specific policy added for these targets
but testing will require first enabling SELinux in the relevant
kernel configs.
Change-Id: I7b4459b32298698fc2908cbbdd0e3afadbe5ac24
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Jeff Brown [Wed, 29 Apr 2015 01:55:14 +0000 (01:55 +0000)]
am
d2ef36ec: Merge "Add float support to binary event log."
* commit '
d2ef36ecbd0ab4c227f51c817869c423eecbdc4d':
Add float support to binary event log.
Jeff Brown [Wed, 29 Apr 2015 01:42:45 +0000 (01:42 +0000)]
Merge "Add float support to binary event log."
Jeff Brown [Tue, 28 Apr 2015 19:46:22 +0000 (12:46 -0700)]
Add float support to binary event log.
Bug:
20664753
Change-Id: Iab232b1f172094919839d57f15644dfb2eaa1425
Evgeniy Stepanov [Tue, 28 Apr 2015 22:10:21 +0000 (22:10 +0000)]
am
cd092913: Merge "Don\'t pack ASAN executables."
* commit '
cd092913aa5dedbaeb4b7b1a6949b3bea15fe75d':
Don't pack ASAN executables.
Dan Albert [Tue, 28 Apr 2015 22:10:18 +0000 (22:10 +0000)]
am
5a54a468: Merge "--no-as-needed needs -Wl."
* commit '
5a54a468bb133d034687869b0771ea700243d4ba':
--no-as-needed needs -Wl.
Evgeniy Stepanov [Tue, 28 Apr 2015 22:06:29 +0000 (22:06 +0000)]
Merge "Don't pack ASAN executables."
Dan Albert [Tue, 28 Apr 2015 21:59:11 +0000 (14:59 -0700)]
Don't pack ASAN executables.
The relocation packer is causing the kernel to load the executable
overlapping ASAN's shadow space.
Bug: http://b/
20665974
Change-Id: Ifc5914f4fbed5f4f00ed1c795d01cf2fcb849cfe
Dan Albert [Tue, 28 Apr 2015 21:56:44 +0000 (21:56 +0000)]
Merge "--no-as-needed needs -Wl."
Dan Albert [Tue, 28 Apr 2015 21:55:50 +0000 (14:55 -0700)]
--no-as-needed needs -Wl.
Not sure why my checkbuild passed.
Change-Id: Iead84121daaaa32c5dd1f0712e9b7caaffd58352
Dan Albert [Tue, 28 Apr 2015 21:31:19 +0000 (21:31 +0000)]
am
a06323d6: Merge "Make asan more closely match clang behavior."
* commit '
a06323d6ed122031ce5c60244d85193dda083c47':
Make asan more closely match clang behavior.
Dan Albert [Tue, 28 Apr 2015 21:18:57 +0000 (21:18 +0000)]
Merge "Make asan more closely match clang behavior."
Dan Albert [Tue, 28 Apr 2015 20:23:36 +0000 (13:23 -0700)]
Make asan more closely match clang behavior.
Always link libm with asan. Hasn't been a problem before because ASAN
was only ever used when libc++ was as well, which already links libm.
Pass --no-as-needed for host modules.
These aren't needed for the target builds because the target uses the
shared RTL.
Change-Id: I5d6a3c2dd557b5231be2b7711df6438693753a88
Dan Albert [Tue, 28 Apr 2015 18:41:26 +0000 (18:41 +0000)]
am
a7ebd27b: Merge "Fix bad variable names."
* commit '
a7ebd27bc5436942d2801619473f4c4633ce2df5':
Fix bad variable names.
Dan Albert [Tue, 28 Apr 2015 18:32:47 +0000 (18:32 +0000)]
Merge "Fix bad variable names."
Dan Albert [Tue, 28 Apr 2015 18:26:45 +0000 (11:26 -0700)]
Fix bad variable names.
My working tree was still dirty when I verified the original change.
Change-Id: I3e6fa6908b809c016231b398c5d30d8cce3b87ab
Evgenii Stepanov [Mon, 27 Apr 2015 22:56:55 +0000 (22:56 +0000)]
am
55f3c4c2: Merge "Fix AddressSanitizer link order and multilib setup."
* commit '
55f3c4c25e4ec9cf80331aa512df8daf8d601fdf':
Fix AddressSanitizer link order and multilib setup.
Evgenii Stepanov [Mon, 27 Apr 2015 22:46:40 +0000 (22:46 +0000)]
Merge "Fix AddressSanitizer link order and multilib setup."
Evgenii Stepanov [Fri, 24 Apr 2015 23:34:47 +0000 (16:34 -0700)]
Fix AddressSanitizer link order and multilib setup.
ASan runtime library (when using dynamic linking) must be the first
dependency of the main executable to achieve correct symbol
interposition. This matches how the clang driver works.
In multilib setup, ASan-RT name depends on the target arch:
/system/lib/libclang_rt.asan-arm-android.so
/system/lib64/libclang_rt.asan-arm64-android.so
We also set RPATH to /system/lib/asan or /system/lib64/asan
to have a place for ASan-only versions of system libraries.
Change-Id: I5c0cdb89e5e08a1950eb276e406da9f31a6e52dd
Dan Albert [Mon, 27 Apr 2015 20:09:30 +0000 (20:09 +0000)]
am
959f0ecc: Merge "Add LOCAL_SANITIZE_RECOVER."
* commit '
959f0eccb444876eb4d30ff4d4542c078e5eb307':
Add LOCAL_SANITIZE_RECOVER.
Dan Albert [Mon, 27 Apr 2015 19:53:01 +0000 (19:53 +0000)]
Merge "Add LOCAL_SANITIZE_RECOVER."
Dan Albert [Fri, 17 Apr 2015 01:08:44 +0000 (18:08 -0700)]
Add LOCAL_SANITIZE_RECOVER.
This is needed for projects that have known ubsan issues that we can't
fix right away (perhaps because it's an upstream project that we're
diligent about keeping in sync with upsteam).
Also make the normal ubsan use -fno-sanitize-recover=all by default.
Change-Id: I1b0f3309792f32dbd08c18816d7306e76c8d7c30
Elliott Hughes [Sat, 25 Apr 2015 18:10:58 +0000 (18:10 +0000)]
am
b271669a: Merge "Fix a trivial comment typo."
* commit '
b271669a0c6dd4287ed1631acecd94c3f443bc8d':
Fix a trivial comment typo.
Elliott Hughes [Sat, 25 Apr 2015 18:04:21 +0000 (18:04 +0000)]
Merge "Fix a trivial comment typo."
Elliott Hughes [Sat, 25 Apr 2015 18:02:40 +0000 (11:02 -0700)]
Fix a trivial comment typo.
Bug: https://code.google.com/p/android/issues/detail?id=170069
Change-Id: Iacd308893561a991971b191d4d10a78ca82753d4
Sami Tolvanen [Sat, 25 Apr 2015 08:07:04 +0000 (08:07 +0000)]
am
00e1f003: Merge "Check partition hash before resorting to block_image_verify"
* commit '
00e1f0033eede8f23ff72097c98b7fd70a4e349d':
Check partition hash before resorting to block_image_verify
Sami Tolvanen [Sat, 25 Apr 2015 08:00:01 +0000 (08:00 +0000)]
Merge "Check partition hash before resorting to block_image_verify"
Nick Kralevich [Sat, 25 Apr 2015 04:44:34 +0000 (04:44 +0000)]
am
f3a6b07b: Merge "host compiler: enable compiler hardening flags"
* commit '
f3a6b07b80a32b822f63cb1d34de64e8395484a8':
host compiler: enable compiler hardening flags
Nick Kralevich [Sat, 25 Apr 2015 04:35:46 +0000 (04:35 +0000)]
Merge "host compiler: enable compiler hardening flags"
Nick Kralevich [Sat, 25 Apr 2015 04:26:08 +0000 (21:26 -0700)]
host compiler: enable compiler hardening flags
Enable the following compiler hardening flags:
* -Wl,-z,relro
* -Wl,-z,now
* -fstack-protector
relro / bind_now make the relro region read-only after linking,
preventing certain attacks against ELF data structures.
stack-protector adds stack canaries, which can detect exploits
which overwrite parts of the stack.
Explicitly not added in this change is FORTIFY_SOURCE=2. Adding that
option turns on glibc's warn_unused_result attributes. This generates
a huge number of new compile time warnings, and for the multiple
makefiles which have -Werror in them, turns those warnings into errors.
I'm not able to fix all the errors right away.
Bug:
20558757
Change-Id: I86791177c6695f5325233d9dd9a5dd3ccc2b1a2f
Dmitriy Ivanov [Fri, 24 Apr 2015 23:59:03 +0000 (23:59 +0000)]
am
573dfb7c: Merge "Pack relocations for mips64"
* commit '
573dfb7cb8f768452744ddb781cc65412ed1a618':
Pack relocations for mips64
Dmitriy Ivanov [Fri, 24 Apr 2015 23:51:28 +0000 (23:51 +0000)]
Merge "Pack relocations for mips64"
Dmitriy Ivanov [Fri, 24 Apr 2015 23:32:38 +0000 (16:32 -0700)]
Pack relocations for mips64
Bug: http://b/
18051137
Change-Id: I063c5d6cf007658c0efe9cb1d65ed8026b3e7dae
Dmitriy Ivanov [Fri, 24 Apr 2015 23:04:46 +0000 (23:04 +0000)]
am
4fa4e4be: Merge "Do not pack relocations for prebuilts by default"
* commit '
4fa4e4befd5bc88ab37d7c7b20d3a67d351a1925':
Do not pack relocations for prebuilts by default
Dmitriy Ivanov [Fri, 24 Apr 2015 22:56:08 +0000 (22:56 +0000)]
Merge "Do not pack relocations for prebuilts by default"
Dmitriy Ivanov [Fri, 24 Apr 2015 22:33:14 +0000 (15:33 -0700)]
Do not pack relocations for prebuilts by default
Do not pack relocations for prebuilds unless
LOCAL_PACK_MODULE_RELOCATIONS is true
Bug: http://b/
20537715
Bug: http://b/
18051137
Change-Id: Iddef3b09741da6ae10d73c98103b868cc7695d38
Dmitriy Ivanov [Fri, 24 Apr 2015 19:55:39 +0000 (19:55 +0000)]
am
691a4379: Merge "Pack relocations for mips"
* commit '
691a4379c3386e39fc362d632acca5276060c23a':
Pack relocations for mips
Dmitriy Ivanov [Fri, 24 Apr 2015 19:45:22 +0000 (19:45 +0000)]
Merge "Pack relocations for mips"
Dmitriy Ivanov [Fri, 24 Apr 2015 19:20:02 +0000 (12:20 -0700)]
Pack relocations for mips
Bug: http://b/
18051137
Change-Id: Id5e0adfb55273f23e1c99b4eecb318c6b8d19989
Dmitriy Ivanov [Fri, 24 Apr 2015 17:54:11 +0000 (17:54 +0000)]
am
b1c2727a: Merge "Pack relocations for x86"
* commit '
b1c2727aecfbd769bc002e1feeea0f6b745c9795':
Pack relocations for x86
Dmitriy Ivanov [Fri, 24 Apr 2015 17:44:09 +0000 (17:44 +0000)]
Merge "Pack relocations for x86"
Dmitriy Ivanov [Fri, 24 Apr 2015 01:43:05 +0000 (18:43 -0700)]
Pack relocations for x86
Bug: http://b/
18051137
Change-Id: I3f316343e9bbd2037a9583d5b6fb41a06be153cd
Sami Tolvanen [Fri, 24 Apr 2015 10:54:01 +0000 (11:54 +0100)]
Check partition hash before resorting to block_image_verify
It's not necessary to call block_image_verify for the most common
case where we attempt an update for the first time and the target
partition has expected contents. It is sufficient to confirm that
the target partition is intact.
Computing a hash is much faster than simulating the update, which
means this change should make the update speed for v3 much closer
to v2 for the common case. If the update was interrupted, this is
going to make resuming somewhat slower, of course. Hopefully this
should be rather rare.
Bug:
20309033
Change-Id: I04792f3681bf2cd5d9a4e1c41eb883c7f26c6f58
Dmitriy Ivanov [Fri, 24 Apr 2015 04:59:15 +0000 (04:59 +0000)]
am
529943c7: Merge "Disable packed relocations for NDK builds"
* commit '
529943c7234a20de4eeb489df9f1c896a09b345f':
Disable packed relocations for NDK builds
Dmitriy Ivanov [Fri, 24 Apr 2015 04:48:43 +0000 (04:48 +0000)]
Merge "Disable packed relocations for NDK builds"
Dmitriy Ivanov [Fri, 24 Apr 2015 01:48:52 +0000 (18:48 -0700)]
Disable packed relocations for NDK builds
Bug: http://b/
20537715
Change-Id: I1289a88d5eb694980b026b695cb25edd8ba76ed5
Dmitriy Ivanov [Thu, 23 Apr 2015 22:28:49 +0000 (22:28 +0000)]
am
648f1b66: Merge "Pack relocation tables for dynamic executables"
* commit '
648f1b66b4a6532383d5382148d586d354026305':
Pack relocation tables for dynamic executables
Dmitriy Ivanov [Thu, 23 Apr 2015 22:20:36 +0000 (22:20 +0000)]
Merge "Pack relocation tables for dynamic executables"
Dmitriy Ivanov [Mon, 20 Apr 2015 23:59:05 +0000 (16:59 -0700)]
Pack relocation tables for dynamic executables
Add replocation-packer step for dynmic executables.
Enable it by default for arm and arm64 platforms.
Bug: http://b/
18051137
Change-Id: I0c88fd31595bcea62a087f219acb9ecf9c80f2e5
Dimitry Ivanov [Thu, 23 Apr 2015 04:32:55 +0000 (04:32 +0000)]
am
1ff47c7f: Merge "Revert "Pack relocation tables for all dynamic executables""
* commit '
1ff47c7f36263a701797ac76594fa45ae2d89389':
Revert "Pack relocation tables for all dynamic executables"
Dimitry Ivanov [Thu, 23 Apr 2015 04:24:46 +0000 (04:24 +0000)]
Merge "Revert "Pack relocation tables for all dynamic executables""
Dimitry Ivanov [Thu, 23 Apr 2015 04:22:33 +0000 (04:22 +0000)]
Revert "Pack relocation tables for all dynamic executables"
This reverts commit
e7a1b8a0c6d5f56e415345a0aceef3afe5ff5eff.
Change-Id: I1a2185e1c68d364941e3b3e525a8c4a7a42e0cc1
Dmitriy Ivanov [Thu, 23 Apr 2015 02:33:15 +0000 (02:33 +0000)]
am
ec6a9773: Merge "Pack relocation tables for all dynamic executables"
* commit '
ec6a977323616f6cd6bd2c08be894e9da4dfc456':
Pack relocation tables for all dynamic executables
Dmitriy Ivanov [Thu, 23 Apr 2015 02:24:44 +0000 (02:24 +0000)]
Merge "Pack relocation tables for all dynamic executables"
Dmitriy Ivanov [Mon, 20 Apr 2015 23:59:05 +0000 (16:59 -0700)]
Pack relocation tables for all dynamic executables
Bug: http://b/
18051137
Change-Id: I277277d5f5eb450ef9b4a23cfec16d75d977eb89
Tao Bao [Wed, 22 Apr 2015 18:47:01 +0000 (18:47 +0000)]
am
7f47c133: Merge "Add support for full radio option"
* commit '
7f47c13339858138744036d9037d52b4a0c445f3':
Add support for full radio option
Tao Bao [Wed, 22 Apr 2015 18:26:30 +0000 (18:26 +0000)]
Merge "Add support for full radio option"
dcashman [Wed, 22 Apr 2015 17:10:51 +0000 (17:10 +0000)]
am
ab59266d: Merge "Add lib dirs to cts distribution."
* commit '
ab59266db0d3d16ca58e06ad327a9909e45c1516':
Add lib dirs to cts distribution.
dcashman [Wed, 22 Apr 2015 17:02:31 +0000 (17:02 +0000)]
Merge "Add lib dirs to cts distribution."
dcashman [Tue, 21 Apr 2015 18:25:28 +0000 (11:25 -0700)]
Add lib dirs to cts distribution.
Add ability to include dirs to the cts distribtion to enable bundling of shared
libraries on which host-side executables rely.
Bug:
19566396
Change-Id: Id501874244ae98fbfef2aa591885c88dee5b8b02
Tao Bao [Tue, 21 Apr 2015 21:32:35 +0000 (14:32 -0700)]
Add support for full radio option
Occasionally we need to include full radio image in incremental OTAs.
Adding --full_radio option to support that.
It needs matching changes in the releasetools.py in the target_files
zip, which comes from device/<vendor>/<device>/releasetools.py.
Bug:
19994922
Change-Id: Id1fb3a9cdb7e67dd9dbadd8fb6cd5fccd358820e
Dmitriy Ivanov [Mon, 20 Apr 2015 20:30:43 +0000 (20:30 +0000)]
am
5beb3387: Merge "Remove unsupported *_COMPRESS_MODULE_SYMBOLS"
* commit '
5beb338793b9047b156aeb841a3417d9709b116f':
Remove unsupported *_COMPRESS_MODULE_SYMBOLS
Dmitriy Ivanov [Mon, 20 Apr 2015 20:18:55 +0000 (20:18 +0000)]
Merge "Remove unsupported *_COMPRESS_MODULE_SYMBOLS"
Dmitriy Ivanov [Mon, 20 Apr 2015 19:06:37 +0000 (12:06 -0700)]
Remove unsupported *_COMPRESS_MODULE_SYMBOLS
Change-Id: Ibb7da2997a0bb5b9f435213c9d3206bc4aad18db
Nick Kralevich [Sat, 18 Apr 2015 00:48:37 +0000 (00:48 +0000)]
am
69b20474: Merge "Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs"
* commit '
69b20474d578ea6313570c29526fc0854a920946':
Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs
Nick Kralevich [Sat, 18 Apr 2015 00:38:07 +0000 (00:38 +0000)]
Merge "Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs"
Nick Kralevich [Fri, 17 Apr 2015 23:53:15 +0000 (16:53 -0700)]
Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs
If a prebuilt APK contains shared libraries and the flag
LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES := true is set, then
uncompress any shared libraries stored within the APK.
This allows processes to load the shared library directly from
the APK.
Bug:
20247329
Bug:
8076853
Bug:
1162500
Change-Id: Iac4db32457d9ce31eb7256410023819b44fda0a6
Dan Albert [Fri, 17 Apr 2015 19:42:42 +0000 (19:42 +0000)]
am
b6874440: Merge "Add support for a partial ubsan build."
* commit '
b68744405129867b6f48e37fdf5f91102f2aba3f':
Add support for a partial ubsan build.
Dan Albert [Fri, 17 Apr 2015 19:33:01 +0000 (19:33 +0000)]
Merge "Add support for a partial ubsan build."
Dmitriy Ivanov [Fri, 17 Apr 2015 19:09:01 +0000 (19:09 +0000)]
am
e3aa1c1f: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
* commit '
e3aa1c1f85f981fabe9be0587e49538f4b6dd576':
Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
Sami Tolvanen [Fri, 17 Apr 2015 18:52:57 +0000 (18:52 +0000)]
am
586b38cc: Merge "Calculate max_stashed_blocks correctly for block OTA v3"
* commit '
586b38cc397758848dbfc09351cadd39b89b9e49':
Calculate max_stashed_blocks correctly for block OTA v3
Dmitriy Ivanov [Fri, 17 Apr 2015 18:50:13 +0000 (18:50 +0000)]
Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
Dan Albert [Fri, 17 Apr 2015 18:48:53 +0000 (18:48 +0000)]
am
1d8f780c: Merge "Fix misuse of my_sanitize_host."
* commit '
1d8f780c7d15441ad6582fc32447d9409c39f31a':
Fix misuse of my_sanitize_host.
Dan Albert [Fri, 17 Apr 2015 18:48:52 +0000 (18:48 +0000)]
am
6ed5bea4: Merge "Make use of sanitizers without clang an error."
* commit '
6ed5bea46fac846f1a96a8245d8f529d691e3da7':
Make use of sanitizers without clang an error.
Sami Tolvanen [Fri, 17 Apr 2015 18:43:51 +0000 (18:43 +0000)]
Merge "Calculate max_stashed_blocks correctly for block OTA v3"
Dmitriy Ivanov [Fri, 17 Apr 2015 18:00:15 +0000 (11:00 -0700)]
Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
Use LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES instead.
Change-Id: Id30529fbc1652d066e0008813352848b5e404ab9
Dan Albert [Fri, 17 Apr 2015 01:07:07 +0000 (18:07 -0700)]
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
Dan Albert [Fri, 17 Apr 2015 18:33:40 +0000 (18:33 +0000)]
Merge "Fix misuse of my_sanitize_host."
Dan Albert [Fri, 17 Apr 2015 18:33:23 +0000 (18:33 +0000)]
Merge "Make use of sanitizers without clang an error."
Dan Albert [Fri, 17 Apr 2015 18:04:06 +0000 (11:04 -0700)]
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
Dan Albert [Fri, 17 Apr 2015 16:48:33 +0000 (09:48 -0700)]
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
Dan Albert [Fri, 17 Apr 2015 16:57:54 +0000 (16:57 +0000)]
am
27176208: Merge "Clean up sanitizer configuration."
* commit '
2717620873fa1936779662a96de05033b89ddb19':
Clean up sanitizer configuration.
Dan Albert [Fri, 17 Apr 2015 16:47:00 +0000 (16:47 +0000)]
Merge "Clean up sanitizer configuration."
Dan Albert [Thu, 16 Apr 2015 23:21:02 +0000 (16:21 -0700)]
Clean up sanitizer configuration.
* Refactor a few pieces to avoid deeply nested conditionals.
* LOCAL_SANITIZE := never replaces LOCAL_ADDRESS_SANITIZER := false.
Change-Id: I68bb8c5edda6ecd40179c5ba9f18d06e96aaa260
Sami Tolvanen [Fri, 17 Apr 2015 15:28:08 +0000 (16:28 +0100)]
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
Lajos Molnar [Fri, 17 Apr 2015 05:07:58 +0000 (05:07 +0000)]
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
Lajos Molnar [Fri, 17 Apr 2015 04:58:21 +0000 (04:58 +0000)]
Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"
Lajos Molnar [Wed, 15 Apr 2015 23:14:39 +0000 (16:14 -0700)]
core_base.mk: switch to new H264 and MPEG2 software codecs
Change-Id: I3078a4ef6e73e95edcdd16b087ac61ae56c4b812
Glenn Kasten [Thu, 16 Apr 2015 23:22:28 +0000 (23:22 +0000)]
am
1004eccb: Merge "Fix bookmark title"
* commit '
1004eccb166908b1411e966ca7f6fac315ad3bb0':
Fix bookmark title
Glenn Kasten [Thu, 16 Apr 2015 23:12:45 +0000 (23:12 +0000)]
Merge "Fix bookmark title"
Glenn Kasten [Thu, 16 Apr 2015 18:56:22 +0000 (11:56 -0700)]
Fix bookmark title
Bug:
20299601
Change-Id: Ie57daf7b378cf370e34ff282d97fd36f2d74031a
Mark Salyzyn [Thu, 16 Apr 2015 17:20:03 +0000 (17:20 +0000)]
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