OSDN Git Service
Dan Willemsen [Wed, 13 Jul 2016 00:48:24 +0000 (00:48 +0000)]
Merge \\\"Pass ENABLE_CPUSETS and ENABLE_SCHEDBOOST to Soong\\\" am:
b8bd19db88 am:
0b728ce11e
am:
ab0bd30ba2
Change-Id: Id06a4f55b05a1db1afd293cf0f622ef50b5489cf
Dan Willemsen [Wed, 13 Jul 2016 00:44:45 +0000 (00:44 +0000)]
Merge \\"Pass ENABLE_CPUSETS and ENABLE_SCHEDBOOST to Soong\\" am:
b8bd19db88
am:
0b728ce11e
Change-Id: I55182beec7dc645c79a1aa668e5854f9b97026ff
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:26:21 +0000 (21:26 +0000)]
Merge \\\"Turn ndk link check warning into error\\\" am:
32ebe53d01 am:
95d3b735b6
am:
bc5f5f2160
Change-Id: If373217b96bfbf99878e6f30649e86dc0559d9b8
Dan Willemsen [Tue, 12 Jul 2016 21:23:04 +0000 (21:23 +0000)]
Merge \\"Turn ndk link check warning into error\\" am:
32ebe53d01
am:
95d3b735b6
Change-Id: I700fa4e5b08149aad3539ae302e904af863e2519
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:31:52 +0000 (16:31 +0000)]
Merge \\\"Remove Android.bp logic from makefiles\\\" am:
8bc18d35ec am:
7dc26e8aa8
am:
95ebfddd5f
Change-Id: I22073f2e6788db034f7a904600100d590efec272
Colin Cross [Tue, 12 Jul 2016 16:23:10 +0000 (16:23 +0000)]
Merge \\"Remove Android.bp logic from makefiles\\" am:
8bc18d35ec
am:
7dc26e8aa8
Change-Id: Iad45e3fd9b172c94df46d20425e51ae7477b5a2d
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
Tianjie Xu [Mon, 11 Jul 2016 20:38:15 +0000 (20:38 +0000)]
Merge "resolve merge conflicts of
333df6c to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
Dan Willemsen [Mon, 11 Jul 2016 20:34:51 +0000 (20:34 +0000)]
Merge \\\"Extend SDK link check to java libraries\\\" am:
e706372ba1 am:
720a966ce5
am:
245b024986
Change-Id: I34889f0e04c8512553fde7f3fc2a03f5f1d2231a
Dan Willemsen [Mon, 11 Jul 2016 20:29:47 +0000 (20:29 +0000)]
Merge \\"Extend SDK link check to java libraries\\" am:
e706372ba1
am:
720a966ce5
Change-Id: I450ebee38513ec45324c3b32b40db7d98753b22f
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"
Tianjie Xu [Mon, 11 Jul 2016 18:42:53 +0000 (11:42 -0700)]
resolve merge conflicts of
333df6c to nyc-mr1-dev-plus-aosp
Change-Id: Ibe66a7c78073a9c3e9f139bd6b00a0afab075190
Tianjie Xu [Mon, 11 Jul 2016 17:59:47 +0000 (17:59 +0000)]
Merge "Add care_map to target_files package" into nyc-mr1-dev
Tao Bao [Mon, 11 Jul 2016 16:20:15 +0000 (16:20 +0000)]
resolve merge conflicts of
4058a71 to stage-aosp-master am:
538ed261eb
am:
4a673770cb
Change-Id: Ibb07dea374703ad2098f1c3744fde0b21a54ed3d
Tao Bao [Mon, 11 Jul 2016 16:16:10 +0000 (16:16 +0000)]
resolve merge conflicts of
4058a71 to stage-aosp-master
am:
538ed261eb
Change-Id: I2ef81a2279ba62bc00c2a40d703666411877058f
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
Tianjie Xu [Tue, 8 Mar 2016 00:31:19 +0000 (16:31 -0800)]
Add care_map to target_files package
Generate a new file containing care_data of system (and vendor)
partition, and add it under META/ of target file package. For
A/B update, copy this file to OTA package for later use by
update_verifier.
Bug:
27175949
Change-Id: I90bb972703afaeb94bc3efe718fd81b1cfbcabcc
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."
OSDN Git Service
