OSDN Git Service
Tao Bao [Fri, 8 Jul 2016 21:17:08 +0000 (21:17 +0000)]
Merge \\\"releasetools: Fix the payload public key replacement.\\\" am:
8a09095c34 am:
c4449f819c
am:
dd740c6817
Change-Id: I3b6be3957589731274ce56034cd5f655874b2fd0
Tao Bao [Fri, 8 Jul 2016 21:12:58 +0000 (21:12 +0000)]
Merge \\"releasetools: Fix the payload public key replacement.\\" am:
8a09095c34
am:
c4449f819c
Change-Id: I1614d0af292c4cb0b6c9b9bc208194c30179c7b9
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 [Fri, 8 Jul 2016 20:02:20 +0000 (20:02 +0000)]
Merge \"releasetools: Fix the payload public key replacement.\" into nyc-mr1-dev
am:
0821fab13a
Change-Id: I15ef57cc520cc2d55ea382688da737d57281358b
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)
Tao Bao [Fri, 8 Jul 2016 19:47:10 +0000 (19:47 +0000)]
Merge "releasetools: Fix the payload public key replacement." into nyc-mr1-dev
Alex Klyubin [Thu, 7 Jul 2016 20:46:47 +0000 (20:46 +0000)]
Merge \\\"Move apksigner library to tools/apksig.\\\" am:
c78147c650 am:
ee7d7e3506
am:
188a4191d9
Change-Id: Id2ba6ab6a50d7cdea5fbcc172e0bb030aff3586e
Alex Klyubin [Thu, 7 Jul 2016 20:43:07 +0000 (20:43 +0000)]
Merge \\"Move apksigner library to tools/apksig.\\" am:
c78147c650
am:
ee7d7e3506
Change-Id: Ic11bee7e6e0fabfd1849ea9dc47fcd6dc5772d1f
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:28:59 +0000 (19:28 +0000)]
Merge \\\"Support LOCAL_STRIP_MODULE := keep_symbols for prebuilts\\\" am:
aa3525dcf1 am:
a00b2765cf
am:
b82ef6edf4
Change-Id: I6b700b83c7ca1f7f4c116c1db729cc9b5cd0566c
Colin Cross [Thu, 7 Jul 2016 19:24:41 +0000 (19:24 +0000)]
Merge \\"Support LOCAL_STRIP_MODULE := keep_symbols for prebuilts\\" am:
aa3525dcf1
am:
a00b2765cf
Change-Id: I703e53b7847fc4ff4b60972094d13670c3ad7207
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:39:06 +0000 (18:39 +0000)]
Merge \\\"Recognize new C/C++ compiler and static analyzer warnings.\\\" am:
1734523900 am:
6beef3807d
am:
d04cbc6f76
Change-Id: I174e89c9b963cd2c4173ec7dbcfb769f6d443ff0
Chih-Hung Hsieh [Thu, 7 Jul 2016 18:28:56 +0000 (18:28 +0000)]
Merge \\"Recognize new C/C++ compiler and static analyzer warnings.\\" am:
1734523900
am:
6beef3807d
Change-Id: I0452a12af98ef1ea8426c0a54211186e4123afdd
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
Tao Bao [Thu, 7 Jul 2016 18:24:12 +0000 (18:24 +0000)]
releasetools: Fix the detection of using squashfs.
am:
f8acad1480
Change-Id: I654730ef8566d12ad17a81261b450a695b79686d
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:23:52 +0000 (17:23 +0000)]
Merge \\\"Never add asan libraries to NDK code\\\" am:
59a405c831 am:
83de5d619a
am:
6549130e7b
Change-Id: Ibea8c4722f9a3d896a205199593ac89b37e72d8a
Dan Willemsen [Thu, 7 Jul 2016 17:20:45 +0000 (17:20 +0000)]
Merge \\"Never add asan libraries to NDK code\\" am:
59a405c831
am:
83de5d619a
Change-Id: Idbc5a8016d8ea02a7c960f350b411814b67e6c2e
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"
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
Alex Klyubin [Wed, 6 Jul 2016 23:26:22 +0000 (23:26 +0000)]
Merge \\\"APK signer primitive.\\\" am:
d81beca2b2 am:
69c8c38f63
am:
a03dc9cab6
Change-Id: Ib51b981eeb4c924dda386481cb0f8b5ecbc80393
Alex Klyubin [Wed, 6 Jul 2016 23:16:52 +0000 (23:16 +0000)]
Merge \\"APK signer primitive.\\" am:
d81beca2b2
am:
69c8c38f63
Change-Id: I296cabea0366e48f1ddaa7abcc189a74b90e529d
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."
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
Ian Pedowitz [Wed, 6 Jul 2016 18:54:12 +0000 (18:54 +0000)]
Merge \"Revert \"Revert \"Revert \"Revert \"Removing N from PLATFORM_VERSION_ALL_CODENAMES\"\"\"\"\" into nyc-mr1-dev
am:
14c2a1586b
Change-Id: I1b95f5049e64a536834f785157748ae20ec9e8a1
Ian Pedowitz [Wed, 6 Jul 2016 18:46:23 +0000 (18:46 +0000)]
Merge "Revert "Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""""" into nyc-mr1-dev
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.
Ian Pedowitz [Tue, 5 Jul 2016 18:25:14 +0000 (18:25 +0000)]
Revert "Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""""
This reverts commit
266600b6391a142c1127db2c2dd738cb1bc7a0df.
Bug:
29117805
Change-Id: Idfc80ee1a91f76088c59a2ebe29a3d96bf02bf03
Alan Viverette [Mon, 4 Jul 2016 01:53:09 +0000 (01:53 +0000)]
Update pathmap.mk for refactored support library
am:
d2fc8094b1
Change-Id: Ifd6fd1c5226dd23be2340dc00a897d2e82699688
Alan Viverette [Sat, 2 Jul 2016 23:40:37 +0000 (19:40 -0400)]
Update pathmap.mk for refactored support library
Fix build following fast-forward of support library branch.
Change-Id: Ib9701b6f31f5b4a18067380875b145d990a07dd3
Joe Fernandez [Fri, 1 Jul 2016 22:48:20 +0000 (22:48 +0000)]
Merge \\"Docs: Adding info in support of TOC for new Performance section.\\" into nyc-dev am:
77a4215191
am:
17e29c2037
Change-Id: I822c26710b50e7bcae3d4cf4d88d6e15df12c3b5
David Friedman [Fri, 1 Jul 2016 22:42:03 +0000 (22:42 +0000)]
Merge \"Docs: Adding info in support of TOC for new Performance section.\" into nyc-dev
am:
77a4215191
Change-Id: If71aa4f05bd7d0f732cf91c1835db95ffab47b64
Joe Fernandez [Fri, 1 Jul 2016 22:42:03 +0000 (22:42 +0000)]
Merge \\"Docs: Adding info in support of TOC for new Performance section.\\" into nyc-dev am:
77a4215191
am:
c746bd459c
Change-Id: Ifefa153a8e15e6bba668cf1f39d607376b2efbd7
David Friedman [Fri, 1 Jul 2016 22:37:09 +0000 (22:37 +0000)]
Merge \"Docs: Adding info in support of TOC for new Performance section.\" into nyc-dev
am:
77a4215191
Change-Id: I83cd35ea59fd61d9aeac5961a98970531c68278c
Joe Fernandez [Fri, 1 Jul 2016 22:18:19 +0000 (22:18 +0000)]
Merge "Docs: Adding info in support of TOC for new Performance section." into nyc-dev
Evgenii Stepanov [Fri, 1 Jul 2016 20:32:57 +0000 (20:32 +0000)]
Merge \\\"Apply SANITIZE_TARGET=safe-stack to 64 bit targets only.\\\" am:
997a6cd1a1 am:
9223ab05ae
am:
f0506c3105
Change-Id: Ia164819f4c3ccf6d0af7610a911bd4bdd8fc947f
Evgenii Stepanov [Fri, 1 Jul 2016 20:27:43 +0000 (20:27 +0000)]
Merge \\"Apply SANITIZE_TARGET=safe-stack to 64 bit targets only.\\" am:
997a6cd1a1
am:
9223ab05ae
Change-Id: Idd26e5a3e33b0875fb0fec2541a3d47c04bf9c34
Evgenii Stepanov [Fri, 1 Jul 2016 20:27:42 +0000 (20:27 +0000)]
Merge \\\"Apply SANITIZE_TARGET and LOCAL_SANITIZE when both are present.\\\" am:
9c88e0bfa2 am:
120112ee23
am:
6902905f37
Change-Id: I929e430a23a0a50476ad2a1896e901b48679b78f
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:22:37 +0000 (20:22 +0000)]
Merge \\"Apply SANITIZE_TARGET and LOCAL_SANITIZE when both are present.\\" am:
9c88e0bfa2
am:
120112ee23
Change-Id: I126d080bf84cf049d6f7f8de1881e4f89e057561
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
Michael Wright [Fri, 1 Jul 2016 15:40:55 +0000 (15:40 +0000)]
N MR1 is API 25
am:
bcdc880ca9
Change-Id: I5351dcf93a5c3aa816b2ea60fae5eb8fef020d5a
Michael Wright [Wed, 29 Jun 2016 14:33:37 +0000 (15:33 +0100)]
N MR1 is API 25
Bug:
29816674
Change-Id: Iaaf6de5e99cf21b489afe677a8bf8b5385d9ca6e
Andreas Gampe [Fri, 1 Jul 2016 05:57:25 +0000 (05:57 +0000)]
Build: Fix vendor sanitizer library for secondary arch
am:
5ed27e2d2f -s ours
Change-Id: Ida95d5f60fd1ced762e62782e582fc012188f86b
Andreas Gampe [Fri, 1 Jul 2016 04:57:31 +0000 (04:57 +0000)]
resolve merge conflicts of
9d73af0 to stage-aosp-master am:
ae492fd5f2
am:
5a88a4c1e8
Change-Id: Ie562114a319b9534851565af47e07458a0481880
Andreas Gampe [Fri, 1 Jul 2016 04:53:32 +0000 (04:53 +0000)]
resolve merge conflicts of
9d73af0 to stage-aosp-master
am:
ae492fd5f2
Change-Id: I8b0a27b2cf9a3179b097765a4c360c0a61c1ff21
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:41:35 +0000 (04:41 +0000)]
Merge \\\"Build: Fix vendor sanitizer library for secondary arch\\\" am:
2302a76966 am:
80b32402dc
am:
2aac82f27c
Change-Id: I55e4d2c2718a49c9929601edefaf2845456eb854
Andreas Gampe [Fri, 1 Jul 2016 04:37:36 +0000 (04:37 +0000)]
Merge \\"Build: Fix vendor sanitizer library for secondary arch\\" am:
2302a76966
am:
80b32402dc
Change-Id: I6b59928b0d37aadbc29b9162521340062ec7d979
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
(cherry picked from commit
cf6268f471f50599c004f6f18ee662273a0542b8)
Change-Id: Iee08422a1f7ad42cbe71a322347e98cb74e3ef7f
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:55:56 +0000 (00:55 +0000)]
Merge \\\"Sanitizer build tweaks.\\\" am:
24dc27e643 am:
bd9f3f6187
am:
fd6304f541
Change-Id: I95c4d2cb618fffab1b7bb24d192c961a8a264ee7
Evgenii Stepanov [Fri, 1 Jul 2016 00:51:33 +0000 (00:51 +0000)]
Merge \\"Sanitizer build tweaks.\\" am:
24dc27e643
am:
bd9f3f6187
Change-Id: I2383d305625a872c7ec44ce594c30bd5c17c2983
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:58:12 +0000 (23:58 +0000)]
Merge \\\"Only add libdl dependency for ASan/TSan on target.\\\" am:
3d8ee8896b am:
2890414f78
am:
b4c796460f
Change-Id: I52a6df13e8c4503be1ddbb0025d2ff632aad2288
Evgenii Stepanov [Thu, 30 Jun 2016 23:58:11 +0000 (23:58 +0000)]
resolve merge conflicts of
ff3341b to stage-aosp-master am:
e6350dfddd
am:
83ae8a4ca9
Change-Id: I5d8893e9da402aea5416e38a3b5c6ef9808d3b17
Evgenii Stepanov [Thu, 30 Jun 2016 23:54:05 +0000 (23:54 +0000)]
Merge \\"Only add libdl dependency for ASan/TSan on target.\\" am:
3d8ee8896b
am:
2890414f78
Change-Id: I77a1824ebd28ad05ff635744e71e65259bf1e8f4
Evgenii Stepanov [Thu, 30 Jun 2016 23:54:04 +0000 (23:54 +0000)]
resolve merge conflicts of
ff3341b to stage-aosp-master
am:
e6350dfddd
Change-Id: If8afcbb7b2734866b1e0ed26760c1cc1fe235634
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
Alex Light [Wed, 29 Jun 2016 22:43:45 +0000 (15:43 -0700)]
resolve merge conflicts of
3f7c348 to nyc-mr1-dev-plus-aosp
Bug:
29278988
Change-Id: Icffb9a280311c7d3c45f096243ddf18f7ebecd9d
Dan Willemsen [Wed, 29 Jun 2016 21:14:14 +0000 (14:14 -0700)]
resolve merge conflicts of
bfbcc0e to nyc-mr1-dev-plus-aosp
Change-Id: Iff6b808f5220050a876bc21fc0d221523d549976
Dan Willemsen [Wed, 29 Jun 2016 20:47:53 +0000 (20:47 +0000)]
Merge \\\"Detect \\\`uname -m\\\` == i686 as a 32-bit host\\\" am:
55d4a46f6d am:
db9f3489bc
am:
3b2288e3e0
Change-Id: I707398613a8aaf095945899f56ac3eb2e13a215b
Dan Willemsen [Wed, 29 Jun 2016 20:45:21 +0000 (20:45 +0000)]
Merge \\"Detect \\`uname -m\\` == i686 as a 32-bit host\\" am:
55d4a46f6d
am:
db9f3489bc
Change-Id: Ia6e75590c95a7e670f977a33b540b76f8b995af8
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"
Alex Light [Wed, 29 Jun 2016 20:26:04 +0000 (20:26 +0000)]
Merge "Add system_other partition, install odex files" into nyc-mr1-dev
TreeHugger Robot [Wed, 29 Jun 2016 20:25:42 +0000 (20:25 +0000)]
Merge "Extract prebuilt APKs from zip files" into nyc-mr1-dev
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:50:53 +0000 (18:50 +0000)]
Merge \\\"Skip copying existing vendor images\\\" am:
1767d3f918 am:
85da4d3566
am:
317d1594e4
Change-Id: I609170449d1312537fd40496075c0b60a2bf9e13
Tianjie Xu [Wed, 29 Jun 2016 18:48:29 +0000 (18:48 +0000)]
Merge \\"Skip copying existing vendor images\\" am:
1767d3f918
am:
85da4d3566
Change-Id: I3d5ff34f134f674cbec66978385ad3936e9c119d
Tianjie Xu [Wed, 29 Jun 2016 18:45:57 +0000 (18:45 +0000)]
Merge \"Skip copying existing vendor images\"
am:
1767d3f918
Change-Id: I5f929adedb17b6d32d2e0e284aa37c39c643c3ea
Tianjie Xu [Wed, 29 Jun 2016 18:37:38 +0000 (18:37 +0000)]
Merge "Skip copying existing vendor images"
Tianjie Xu [Tue, 28 Jun 2016 21:34:03 +0000 (14:34 -0700)]
Skip copying existing vendor images
add_img_to_target_files.py has an option of "-a" to add missing
images only. Under this option, the script should skip copying
the radio images for A/B devices when given image exists already
under "IMAGES/".
Test: Run the command on an A/B device, the existing radio images under "IMAGES/" don't get overwritten; and missing images are added correctly.
Bug:
29608905
Change-Id: Ie034b85a5d777d53e367f99470cea4d19cb1aaaf
Yi Kong [Wed, 29 Jun 2016 11:14:30 +0000 (11:14 +0000)]
Merge \\\"Add jdk.net to whitelist\\\" am:
d2f4cbbf88 am:
09d7992067
am:
3fc2a2c326
Change-Id: I5939b0d36c8366ff2935ede6d295601951714e62
Yi Kong [Wed, 29 Jun 2016 11:11:49 +0000 (11:11 +0000)]
Merge \\"Add jdk.net to whitelist\\" am:
d2f4cbbf88
am:
09d7992067
Change-Id: I8f76af8ade472df24a7adaee133106cd6c54c2c3
OSDN Git Service
