OSDN Git Service
Chih-Hung Hsieh [Fri, 22 Jul 2016 01:02:47 +0000 (01:02 +0000)]
Merge \"Count warnings per project and dump out CSV format.\"
am:
053c54b554
Change-Id: I22315bc641d501e74b995ddde8d7624fa9a6b883
Chih-hung Hsieh [Fri, 22 Jul 2016 00:54:50 +0000 (00:54 +0000)]
Merge "Count warnings per project and dump out CSV format."
Chih-Hung Hsieh [Thu, 21 Jul 2016 21:22:53 +0000 (14:22 -0700)]
Count warnings per project and dump out CSV format.
* No change to html output, except removing unused "PageTop" anchor.
* Add --gencsv flag to output a CSV file instead of html file.
CSV files are combined to a table for dashboard charts.
* Count warnings from selected source project directories.
* CSV output lines are:
num_of_warnings,project_name,warning_description
* project_name is empty for sum of warnings from all projects.
* warning_description could be:
(1) "<severity>: <warning type description>"
for one warning type, or
(2) "<severity> warnings"
for all warning types of the severity.
Change-Id: I1cf976ed0cf142091226b22665b7f28d383608fd
Test: run through current build.log files.
Colin Cross [Thu, 21 Jul 2016 17:58:10 +0000 (17:58 +0000)]
Merge \"Split -isystem headers into separate variables\"
am:
921be36569
Change-Id: Icd539e53caa9ad55e900b394c6005bb3606dce70
Colin Cross [Thu, 21 Jul 2016 17:51:13 +0000 (17:51 +0000)]
Merge "Split -isystem headers into separate variables"
Colin Cross [Wed, 20 Jul 2016 19:22:57 +0000 (12:22 -0700)]
Split -isystem headers into separate variables
Split the variables that contain header directories into ones that
should be prefixed with -isystem and ones that should be prefixed with
-I in preparation for moving some headers from -isystem to -I.
Add $(wildcard) around SRC_HEADERS to match the soong behavior, and move
users of SRC_HEADERS from config.mk to binary.mk so that the exported
soong value is present.
Test: no changes to build.ninja compile rules
Change-Id: Iadecbbf4351a01e53cb57e721d31f4f836bb82d9
Chih-Hung Hsieh [Wed, 20 Jul 2016 23:08:36 +0000 (23:08 +0000)]
Merge \"Recognize new clang and clang-tidy warnings.\"
am:
6131119708
Change-Id: If307f868da5d961ad3c1cac371ca3e5a42a6b652
Treehugger Robot [Wed, 20 Jul 2016 22:57:29 +0000 (22:57 +0000)]
Merge "Recognize new clang and clang-tidy warnings."
Chih-Hung Hsieh [Wed, 20 Jul 2016 17:08:51 +0000 (10:08 -0700)]
Recognize new clang and clang-tidy warnings.
* Count new clang-tidy warnings:
google-runtime-references
google-runtime-operator
* Count new clang warnings:
-Wconst-conversion similar to -Wliteral-conversion
-Wundefined-var-template
* Modified static analyzer warning message about
"Null passed to a callee that requires a non-null ..."
* Disable google-runtime-references by default and
disable misc-macro-parentheses in vendor projects;
too many old C/C++ code have this warning.
Change-Id: Ib35e0af85875aada17c92b0237b76cd5ae3bfcc8
Test: build with clang-tidy.
Colin Cross [Wed, 20 Jul 2016 21:24:29 +0000 (21:24 +0000)]
Merge \"Factor out common include directories into helper\"
am:
95fa32b577
Change-Id: I720d7c02de3d11b4a5a3328946433aa7274f1bb6
Treehugger Robot [Wed, 20 Jul 2016 21:11:22 +0000 (21:11 +0000)]
Merge "Factor out common include directories into helper"
Fang Deng [Tue, 19 Jul 2016 23:41:57 +0000 (23:41 +0000)]
Merge \"Remove GOMA_HERMETIC form goma.mk\"
am:
14df2ef4d0
Change-Id: Ie9612d77fd35fb25aaad6db1b8c690b139cc1764
Pirama Arumuga Nainar [Tue, 19 Jul 2016 23:40:37 +0000 (23:40 +0000)]
Merge \"Switch to prebuilt clang-
3016494\"
am:
b1beb6f274
Change-Id: Ic0cc4734481cddb87ed8c21d2079ab0645dbcc82
Pirama Arumuga Nainar [Tue, 19 Jul 2016 23:40:23 +0000 (23:40 +0000)]
Merge \"Disable warnings triggered in Clang r271374\"
am:
11e0e36462
Change-Id: I315936308c883352a195dc4aff0b9f42757019f1
Fang Deng [Tue, 19 Jul 2016 23:32:37 +0000 (23:32 +0000)]
Merge "Remove GOMA_HERMETIC form goma.mk"
Colin Cross [Tue, 19 Jul 2016 20:19:21 +0000 (13:19 -0700)]
Factor out common include directories into helper
Refactor includes in transform-*-to-o to simplify future changes to the
default include paths.
Test: whitespace-only changes to the compile rules in build.ninja
Change-Id: I766af1f22a4838d933691b6df37530db3ba4e21d
Stephen Hines [Tue, 19 Jul 2016 22:02:31 +0000 (22:02 +0000)]
Merge "Switch to prebuilt clang-
3016494"
Stephen Hines [Tue, 19 Jul 2016 22:02:31 +0000 (22:02 +0000)]
Merge "Disable warnings triggered in Clang r271374"
Fang Deng [Tue, 19 Jul 2016 01:33:04 +0000 (01:33 +0000)]
Remove GOMA_HERMETIC form goma.mk
This CL removes the GOMA_HERMETIC setting from goma.mk so that
the default setting will be used. By default, GOMA will fallback
to local compiler if the exactly matched compiler is not available.
Change-Id: I22c83594f6bd30bc8ed1334ab7bb256ef218567b
Pirama Arumuga Nainar [Tue, 28 Jun 2016 17:54:33 +0000 (10:54 -0700)]
Disable warnings triggered in Clang r271374
http://b/
28149048
http://b/
29823425
Disable -Wnull-dereference. The second bug above tracks that this
warning gets re-enabled.
Test: Tested build, boot and common usage for Arm, Arm64, x86, x86_64,
Mips images in AOSP and internal branch.
Change-Id: Ie41a495dd9bb247d3609f4848d7669d1faaeeb79
Pirama Arumuga Nainar [Tue, 28 Jun 2016 17:58:39 +0000 (10:58 -0700)]
Switch to prebuilt clang-
3016494
Test: Tested build, boot and common usage for Arm, Arm64, x86, x86_64,
Mips images in AOSP and internal branch.
Bug: http://b/
29823425
Change-Id: I97299c8b41ff9d3ac7019a349aa569609a099233
Chih-Hung Hsieh [Mon, 18 Jul 2016 23:38:24 +0000 (23:38 +0000)]
Merge \"Avoid matching the same warning line twice.\"
am:
0cbba3df2a
Change-Id: I641fa895ac7033056833107bf062015987965632
Treehugger Robot [Mon, 18 Jul 2016 23:18:47 +0000 (23:18 +0000)]
Merge "Avoid matching the same warning line twice."
Chih-Hung Hsieh [Mon, 18 Jul 2016 22:27:02 +0000 (15:27 -0700)]
Avoid matching the same warning line twice.
Used to skip only immediately followed identical warning lines.
Now classifywarning is called only once for each unique warning line.
Change-Id: Ie3b77ded70b41dafad91c042dbe15ad2be119e62
Test: run through build.log file
Dan Willemsen [Mon, 18 Jul 2016 19:26:18 +0000 (19:26 +0000)]
Merge \"Rename libevent-host to libevent\"
am:
575a023039
Change-Id: Ia98511562db8071258101d38f83f4083db966357
Dan Willemsen [Mon, 18 Jul 2016 19:18:32 +0000 (19:18 +0000)]
Merge "Rename libevent-host to libevent"
Colin Cross [Sun, 17 Jul 2016 23:45:02 +0000 (23:45 +0000)]
Merge \"Only add linker_asan as dependency to shared executables\"
am:
458c0cd37b
Change-Id: I4c50d21b480200588d4581662d9fda86bb18ee3b
Colin Cross [Sun, 17 Jul 2016 23:38:39 +0000 (23:38 +0000)]
Merge "Only add linker_asan as dependency to shared executables"
Colin Cross [Sun, 17 Jul 2016 22:28:07 +0000 (15:28 -0700)]
Only add linker_asan as dependency to shared executables
linker_asan is only needed by shared exectuables, prevent adding it as a
dependency of anything else. Avoids a dependency loop from
linker_asan -> linker -> linker_asan.
Change-Id: Id7744ad8a5901468518fac80741c75e764adb559
Colin Cross [Fri, 15 Jul 2016 21:49:45 +0000 (14:49 -0700)]
resolve merge conflicts of
1e92cfb to stage-aosp-master
Change-Id: I1929d5c16ea0b8574372049ac7dffd30fd3e1db3
Treehugger Robot [Fri, 15 Jul 2016 21:34:33 +0000 (21:34 +0000)]
Merge "Add support for LOCAL_MODULE_SYMLINKS"
Colin Cross [Thu, 14 Jul 2016 23:02:57 +0000 (16:02 -0700)]
Add support for LOCAL_MODULE_SYMLINKS
Specifying LOCAL_MODULE_SYMLINKS will create symlinks to the installed
module in the same directory.
Change-Id: Idecb2b75f0c9999eb000eed9a79a989244ccf6c2
Badhri Jagan Sridharan [Fri, 15 Jul 2016 17:10:40 +0000 (17:10 +0000)]
Merge \"Add build variant to kernel command line\"
am:
70a9714625
Change-Id: I5e10a5375f50e9562af73407212fd4a800884b20
Badhri Jagan Sridharan [Fri, 15 Jul 2016 17:00:13 +0000 (17:00 +0000)]
Merge "Add build variant to kernel command line"
Dan Willemsen [Thu, 14 Jul 2016 06:47:24 +0000 (23:47 -0700)]
Rename libevent-host to libevent
There's no need to use a different name for target and host modules, and
in Soong, it's better to use the same for both.
Change-Id: Ib2d8d0cc8a1e0f7f95d7c2795a360f02d946fa1a
Dan Willemsen [Thu, 14 Jul 2016 04:09:47 +0000 (04:09 +0000)]
Merge \"Allow prebuilts to specify mini-debug-info\"
am:
4ea20be28b
Change-Id: I410014ad90800d78753f0c5c8cbb948aef369614
Dan Willemsen [Thu, 14 Jul 2016 04:04:42 +0000 (04:04 +0000)]
Merge "Allow prebuilts to specify mini-debug-info"
Dan Willemsen [Wed, 13 Jul 2016 23:08:36 +0000 (16:08 -0700)]
Allow prebuilts to specify mini-debug-info
So that Soong can specify the default that's used by Make.
Change-Id: I0c1062ad8f21df8b9a483f99dce679a1434e4859
Gaelle Nassiet [Wed, 13 Jul 2016 23:15:12 +0000 (23:15 +0000)]
Merge \"Fix root_filesystem_config.txt generation\"
am:
461a3283d9
Change-Id: I07ebb4520d02948bff90911d03692d7896dff89c
Tao Bao [Wed, 13 Jul 2016 23:04:10 +0000 (23:04 +0000)]
Merge "Fix root_filesystem_config.txt generation"
Dan Willemsen [Wed, 13 Jul 2016 00:41:21 +0000 (00:41 +0000)]
Merge \"Pass ENABLE_CPUSETS and ENABLE_SCHEDBOOST to Soong\"
am:
b8bd19db88
Change-Id: I4d8f00990957b583bf58c4e7770fd73430526431
Treehugger Robot [Wed, 13 Jul 2016 00:39:05 +0000 (00:39 +0000)]
Merge "Pass ENABLE_CPUSETS and ENABLE_SCHEDBOOST to Soong"
Dan Willemsen [Tue, 12 Jul 2016 22:00:46 +0000 (15:00 -0700)]
Pass ENABLE_CPUSETS and ENABLE_SCHEDBOOST to Soong
Change-Id: I75c0d60854f2ea3d2e4e4d6dcbc6845e3b0336ad
Dan Willemsen [Tue, 12 Jul 2016 21:19:46 +0000 (21:19 +0000)]
Merge \"Turn ndk link check warning into error\"
am:
32ebe53d01
Change-Id: I89ff2a720b27a288b9f64412dd213d7019ffca66
Treehugger Robot [Tue, 12 Jul 2016 21:09:32 +0000 (21:09 +0000)]
Merge "Turn ndk link check warning into error"
Dan Willemsen [Tue, 12 Jul 2016 20:10:31 +0000 (13:10 -0700)]
Turn ndk link check warning into error
All instances of this have been removed from the downstream trees. The
APK->JNI_SHARED_LIBRARY and Java->Java checks remain as warnings.
Change-Id: I3eaee284500deee0f26a4f9cdd96497e99ec533e
Colin Cross [Tue, 12 Jul 2016 16:20:29 +0000 (16:20 +0000)]
Merge \"Remove Android.bp logic from makefiles\"
am:
8bc18d35ec
Change-Id: I50c8180c8297feb48ff5c5eba10670b36f631921
Colin Cross [Tue, 12 Jul 2016 16:15:53 +0000 (16:15 +0000)]
Merge "Remove Android.bp logic from makefiles"
Colin Cross [Mon, 11 Jul 2016 23:57:33 +0000 (16:57 -0700)]
Remove Android.bp logic from makefiles
When Soong was optional, the make build system needed extra complexity
to ignore Android.mk files that had an associated Android.bp file. Now
that Soong is required and the Android.mk files that were obsoleted by
an associated Android.bp file have been removed, remove all of the logic
that found associated Android.bp files. Android.mk files and Android.bp
files are now handled independently.
Change-Id: Ia6643d151b920689219ca8abd59ede44d230ba35
Dan Willemsen [Mon, 11 Jul 2016 20:27:08 +0000 (20:27 +0000)]
Merge \"Extend SDK link check to java libraries\"
am:
e706372ba1
Change-Id: Ia4cb9cfe94da5bdccce8726ed8777de13638bada
Dan Willemsen [Mon, 11 Jul 2016 20:20:40 +0000 (20:20 +0000)]
Merge "Extend SDK link check to java libraries"
Tao Bao [Mon, 11 Jul 2016 16:08:24 +0000 (09:08 -0700)]
resolve merge conflicts of
4058a71 to stage-aosp-master
Change-Id: I0816bfc5d8adb20e175617d97651f1474ce4e916
Treehugger Robot [Mon, 11 Jul 2016 15:55:51 +0000 (15:55 +0000)]
Merge changes from topic 'imgdiff-squashfs'
* changes:
releasetools: Fix the detection of using squashfs.
releasetools: Disable using imgdiff for squashfs.
Tao Bao [Thu, 7 Jul 2016 16:09:58 +0000 (09:09 -0700)]
releasetools: Fix the detection of using squashfs.
We should disable using imgdiff if *any* of the source and target
partitions uses squashfs.
Bug:
30004734
Test: Create an incremental with two builds with one of them uses squashfs.
Change-Id: I826cd13d7b852c548e4b45e61f5ae00f6407cac3
(cherry picked from commit
f8acad1480a3b4479c7ddfa89df8be946d83d3ed)
Tao Bao [Sat, 11 Jun 2016 19:19:23 +0000 (12:19 -0700)]
releasetools: Disable using imgdiff for squashfs.
We use imgdiff to handle files in zip format (e.g. jar/zip/apk) for
higher compression ratio.
For system/vendor in squashfs, a) all files are compressed in LZ4
format; b) we use 4096-byte block size in their sparse images, but the
files in squashfs may not be laid out as 4K-aligned. So the blocks for
a given file as listed in block map may not form a valid zip file, which
may fail the patch generation with imgdiff.
Disable using imgdiff for squashfs images, and use bsdiff instead.
Bug:
22322817
Change-Id: Ie76aa4cece5c9d38cb1d1a34c505a4a8f37512d3
(cherry picked from commit
293fd135c7bc0c21b41f1782d21c26de64e8854a)
Dan Willemsen [Sat, 9 Jul 2016 04:33:05 +0000 (21:33 -0700)]
Extend SDK link check to java libraries
Java code using the SDK should not link to java code built with the
platform APIs or the system SDK. Java code using the system SDK should
not link to the platform APIs either, but it can link to java code using
another SDK.
Change-Id: Iaae0a7e01993cfa1e023649fbd8a7974b5eca709
Tao Bao [Fri, 8 Jul 2016 21:09:20 +0000 (21:09 +0000)]
Merge \"releasetools: Fix the payload public key replacement.\"
am:
8a09095c34
Change-Id: I464ec9dd1a12dcb06bc1dcbf340fdcbac04b9575
Treehugger Robot [Fri, 8 Jul 2016 20:58:49 +0000 (20:58 +0000)]
Merge "releasetools: Fix the payload public key replacement."
Tao Bao [Wed, 6 Jul 2016 22:28:59 +0000 (15:28 -0700)]
releasetools: Fix the payload public key replacement.
update_engine expects the extracted public key instead of the
certificate.
Bug:
28701652
Change-Id: I292d39da9e039f96d01a4214226aeb46f8cb881d
(cherry picked from commit
afaf295cb85eb4091bc8a82950acab618b4139ca)
Gaelle Nassiet [Fri, 24 Jun 2016 09:18:53 +0000 (11:18 +0200)]
Fix root_filesystem_config.txt generation
The first line returned by awk is empty. In consequence, when
fs_config computes its mode it will consider this line as a file (no
trailing slash) and affect the default android_files mode which is
0644. The mode for the root directory should be the default
android_dirs mode 0755.
Add a special case in fs_config to consider empty line as a directory.
Change-Id: I9f33f6fcf4be05c31914db898e65c92b0a611518
Signed-off-by: Gaelle Nassiet <gaellex.nassiet@intel.com>
Alex Klyubin [Thu, 7 Jul 2016 20:40:05 +0000 (20:40 +0000)]
Merge \"Move apksigner library to tools/apksig.\"
am:
c78147c650
Change-Id: I34e66d67736fb0a671f8030b4c94983a908e5d8c
Treehugger Robot [Thu, 7 Jul 2016 20:33:04 +0000 (20:33 +0000)]
Merge "Move apksigner library to tools/apksig."
Colin Cross [Thu, 7 Jul 2016 19:21:19 +0000 (19:21 +0000)]
Merge \"Support LOCAL_STRIP_MODULE := keep_symbols for prebuilts\"
am:
aa3525dcf1
Change-Id: I968afb2a8abfe9763a6fc1ee7eff5abf41d3a094
Treehugger Robot [Thu, 7 Jul 2016 19:14:54 +0000 (19:14 +0000)]
Merge "Support LOCAL_STRIP_MODULE := keep_symbols for prebuilts"
Chih-Hung Hsieh [Thu, 7 Jul 2016 18:24:12 +0000 (18:24 +0000)]
Merge \"Recognize new C/C++ compiler and static analyzer warnings.\"
am:
1734523900
Change-Id: I71b8f324ad88ff38b077ba1763c163f9d80a30fa
Colin Cross [Thu, 7 Jul 2016 18:16:49 +0000 (11:16 -0700)]
Support LOCAL_STRIP_MODULE := keep_symbols for prebuilts
Change-Id: I92a838b07fe4116d5a4b8521fe1ce8d44e6e84e2
Treehugger Robot [Thu, 7 Jul 2016 18:07:21 +0000 (18:07 +0000)]
Merge "Recognize new C/C++ compiler and static analyzer warnings."
Alex Klyubin [Thu, 7 Jul 2016 16:32:28 +0000 (09:32 -0700)]
Move apksigner library to tools/apksig.
This moves build/tools/apksigner/core to its own project tools/apksig.
The move also renames the moved Java packages from
com.android.apksigner.core.* to com.android.apksig.* to reflect the
new name of the library.
Bug:
27461702
Change-Id: Iab812ae2b8f0a741014f842460c78e35bc249d43
Dan Willemsen [Thu, 7 Jul 2016 17:17:44 +0000 (17:17 +0000)]
Merge \"Never add asan libraries to NDK code\"
am:
59a405c831
Change-Id: I6e6129204efe2478c5f7ff6ea0bf04e81203c113
Dan Willemsen [Thu, 7 Jul 2016 17:07:42 +0000 (17:07 +0000)]
Merge "Never add asan libraries to NDK code"
Alex Klyubin [Wed, 6 Jul 2016 23:14:09 +0000 (23:14 +0000)]
Merge \"APK signer primitive.\"
am:
d81beca2b2
Change-Id: I9570df7b5f7a70b4fdd04cbbdeae80d3e5bf9616
Treehugger Robot [Wed, 6 Jul 2016 22:59:32 +0000 (22:59 +0000)]
Merge "APK signer primitive."
Chih-Hung Hsieh [Fri, 1 Jul 2016 22:48:06 +0000 (15:48 -0700)]
Recognize new C/C++ compiler and static analyzer warnings.
Change-Id: I5f47c45498c640702922704aa5305a85e9493fcc
Test: run with Android build.log.
Evgenii Stepanov [Fri, 1 Jul 2016 20:22:41 +0000 (20:22 +0000)]
Merge \"Apply SANITIZE_TARGET=safe-stack to 64 bit targets only.\"
am:
997a6cd1a1
Change-Id: Ic8bc436901efd0b8ba099d68b61faa46a8d503fd
Evgenii Stepanov [Fri, 1 Jul 2016 20:17:39 +0000 (20:17 +0000)]
Merge \"Apply SANITIZE_TARGET and LOCAL_SANITIZE when both are present.\"
am:
9c88e0bfa2
Change-Id: I828de48b2f552801ec83c11f493eaaacb5f83e47
Evgenii Stepanov [Fri, 1 Jul 2016 20:09:45 +0000 (20:09 +0000)]
Merge "Apply SANITIZE_TARGET=safe-stack to 64 bit targets only."
Evgenii Stepanov [Sat, 7 May 2016 01:15:57 +0000 (18:15 -0700)]
Apply SANITIZE_TARGET=safe-stack to 64 bit targets only.
Bug:
27729263
Change-Id: I214a9f40b94f6e6716aca05be774f014e62f73e8
Evgenii Stepanov [Fri, 1 Jul 2016 20:07:04 +0000 (20:07 +0000)]
Merge "Apply SANITIZE_TARGET and LOCAL_SANITIZE when both are present."
Evgenii Stepanov [Fri, 20 May 2016 00:45:21 +0000 (17:45 -0700)]
Apply SANITIZE_TARGET and LOCAL_SANITIZE when both are present.
The idea is that targets with LOCAL_SANITIZE = signed-integer-overflow
and SANITIZE_TARGET=safe-stack should get both sanitizers.
This should work just fine for SANITIZE_TARGET=address, too.
Bug:
27729263
Change-Id: Ifee350da4877008fb061bc7f6c700e7fade405bc
Andreas Gampe [Fri, 1 Jul 2016 04:42:44 +0000 (21:42 -0700)]
resolve merge conflicts of
9d73af0 to stage-aosp-master
Change-Id: I984c48310e72cb509b859501cfb07258214038fa
Andreas Gampe [Fri, 1 Jul 2016 04:33:43 +0000 (04:33 +0000)]
Merge \"Build: Fix vendor sanitizer library for secondary arch\"
am:
2302a76966
Change-Id: I2b21579df22b08655cdc9eab2d570304b167b5b6
Treehugger Robot [Fri, 1 Jul 2016 04:26:26 +0000 (04:26 +0000)]
Merge changes I17a96b97,Ib4412657,I73e6d479
* changes:
Build: Add module-level product configuration of sanitization
Build: Add option to restrict sanitization by owner
Build: Add option to restrict sanitization by architecture
Treehugger Robot [Fri, 1 Jul 2016 04:24:46 +0000 (04:24 +0000)]
Merge "Build: Fix vendor sanitizer library for secondary arch"
Andreas Gampe [Fri, 1 Jul 2016 03:20:38 +0000 (20:20 -0700)]
Build: Fix vendor sanitizer library for secondary arch
Fix the directory for secondary-architecture libraries under
sanitization. These incorrectly wrote into vendor/lib instead
of data/vendor/lib.
Bug:
29498013
Change-Id: Iee08422a1f7ad42cbe71a322347e98cb74e3ef7f
Evgenii Stepanov [Fri, 1 Jul 2016 00:47:39 +0000 (00:47 +0000)]
Merge \"Sanitizer build tweaks.\"
am:
24dc27e643
Change-Id: I351ba996ee3ed77f6400e48149c972e271476a8f
Evgenii Stepanov [Fri, 1 Jul 2016 00:42:12 +0000 (00:42 +0000)]
Merge "Sanitizer build tweaks."
Evgenii Stepanov [Fri, 20 May 2016 00:49:51 +0000 (17:49 -0700)]
Sanitizer build tweaks.
-Wl,-no-undefined is currently disabled for any SANITIZE_TARGET. Limit that to
the sanitizers with a runtime library (i.e. address, thread).
Re-enable the relocation packer for ASan. This has been fixed upstream a long
time ago.
Bug:
27729263
Change-Id: I566df6104de816223dc1c519d41a87629ce9c47c
Evgenii Stepanov [Thu, 30 Jun 2016 23:50:50 +0000 (23:50 +0000)]
Merge \"Only add libdl dependency for ASan/TSan on target.\"
am:
3d8ee8896b
Change-Id: I97e2daed8c10a325e27969c2fcaac1848dfefa80
Evgenii Stepanov [Thu, 30 Jun 2016 23:49:26 +0000 (23:49 +0000)]
Merge "Only add libdl dependency for ASan/TSan on target."
Evgenii Stepanov [Thu, 12 May 2016 20:07:36 +0000 (13:07 -0700)]
Only add libdl dependency for ASan/TSan on target.
Only sanitizers that intercept stuff need that. For example,
SafeStack does not, and I think UBSan too.
Bug:
27729263
Change-Id: I413cd46cc6c6914a363a3c53da7954beacd8f0d8
Evgenii Stepanov [Thu, 30 Jun 2016 23:34:49 +0000 (16:34 -0700)]
resolve merge conflicts of
ff3341b to stage-aosp-master
Change-Id: I1883410889b8e6c6505042fcebca6c8764e15e9a
Andreas Gampe [Mon, 27 Jun 2016 22:15:31 +0000 (15:15 -0700)]
Build: Add module-level product configuration of sanitization
To allow special sanitizer settings for modules shared between
products, add product-specific module settings.
This was copied from the product-specific dexopt settings.
Bug:
29498013
Change-Id: I17a96b975bb6ac7f4ffb3d5b08e2f00b21bd97a1
(cherry picked from commit
bb5454b6db5770f0b0275424148b2d7d3c52a56d)
Andreas Gampe [Tue, 21 Jun 2016 00:46:29 +0000 (17:46 -0700)]
Build: Add option to restrict sanitization by owner
Add Make variable SANITIZE_NEVER_BY_OWNER to selectively
sanitize modules. By default, both are being sanitized. The
value of the variable is interpreted as a space or colon
separated list of owner names.
This can be used to create builds that lower the sanitization
burden by not sanitizing parts of the platform.
Bug:
29498013
Change-Id: Ib4412657fd38ff28a5c0863eddc2acde63c88ebb
(cherry picked from commit
ea38d8e95d7daea49cc2a528d69e06a0005b31a6)
Andreas Gampe [Tue, 21 Jun 2016 00:36:49 +0000 (17:36 -0700)]
Build: Add option to restrict sanitization by architecture
Add Make variable SANITIZE_ARCH to selectively sanitize binaries.
This uses the "bitness," i.e., 32 or 64, to potentially filter
the sanitization. By default, both are being sanitized.
This can be used to create builds that lower the sanitization
burden by not sanitizing "half" of the platform.
Bug:
29498013
Change-Id: I73e6d479f08a970ba912f4f63967d32f3487125f
(cherry picked from commit
0290a416c844f9a8ec953f63f199b00d36283228)
Evgenii Stepanov [Thu, 30 Jun 2016 22:49:52 +0000 (22:49 +0000)]
Merge "Add LOCAL_NOSANITIZE."
Evgenii Stepanov [Thu, 12 May 2016 20:07:17 +0000 (13:07 -0700)]
Add LOCAL_NOSANITIZE.
This can be used to selectively disable individual sanitizers on a
target. For example, some parts of libc should be built with
SafeStack (when requested with SANITIZE_TARGET), but never with
AddressSanitizer. Current build rules specify LOCAL_SANITIZE := never
to disable AddressSanitizer; the idea is to change that to
LOCAL_NOSANITIZE := address thread.
Bug:
27729263
Change-Id: I2b770f2ce3faf6ad6798792327e96adb86fe4a4f
Dan Willemsen [Wed, 29 Jun 2016 20:39:42 +0000 (20:39 +0000)]
Merge \"Detect \`uname -m\` == i686 as a 32-bit host\"
am:
55d4a46f6d
Change-Id: Ia66952b98541755c55df1eb98775d749d2155dc1
Treehugger Robot [Wed, 29 Jun 2016 20:37:13 +0000 (20:37 +0000)]
Merge "Detect `uname -m` == i686 as a 32-bit host"
Dan Willemsen [Wed, 29 Jun 2016 19:26:53 +0000 (12:26 -0700)]
Detect `uname -m` == i686 as a 32-bit host
Change-Id: I0350629ce6ea7a5f0224489bafc98bc190e70932
Test: UNAME from https://groups.google.com/d/msg/android-building/nGQna2xuW5s/eEcXSo9ZBgAJ
Tianjie Xu [Wed, 29 Jun 2016 18:45:57 +0000 (18:45 +0000)]
Merge \"Skip copying existing vendor images\"
am:
1767d3f918
Change-Id: I5f929adedb17b6d32d2e0e284aa37c39c643c3ea