OSDN Git Service
Andy Hung [Fri, 11 Dec 2015 20:08:51 +0000 (20:08 +0000)]
Merge "Add audioserver executable to base config"
Alex Klyubin [Fri, 11 Dec 2015 18:47:26 +0000 (10:47 -0800)]
Merge "Make signapk use Conscrypt." am:
7884a63731
am:
dfd2199ef6
* commit '
dfd2199ef66dcc162a0165f9a34652ae2877538d':
Make signapk use Conscrypt.
Alex Klyubin [Fri, 11 Dec 2015 18:37:16 +0000 (10:37 -0800)]
Merge "Make signapk use Conscrypt."
am:
7884a63731
* commit '
7884a63731a876f483c13288c87d8e7af7a533e4':
Make signapk use Conscrypt.
Alex Klyubin [Fri, 11 Dec 2015 18:29:36 +0000 (18:29 +0000)]
Merge "Make signapk use Conscrypt."
Chih-hung Hsieh [Fri, 11 Dec 2015 18:25:29 +0000 (10:25 -0800)]
Merge "Change USE_CLANG_PLATFORM_BUILD default to true." am:
eb486309d8
am:
a3fbb3b0e4
* commit '
a3fbb3b0e49bfbec697f73d4c4e77bb12f8e348e':
Change USE_CLANG_PLATFORM_BUILD default to true.
Alex Deymo [Fri, 11 Dec 2015 17:30:56 +0000 (09:30 -0800)]
Merge "Rename libext2 host libraries to standard suffix." am:
6950168f1d
am:
2001743c7a
* commit '
2001743c7a4c3619163811d571c59243a2c3c742':
Rename libext2 host libraries to standard suffix.
Chih-hung Hsieh [Fri, 11 Dec 2015 17:08:07 +0000 (09:08 -0800)]
Merge "Change USE_CLANG_PLATFORM_BUILD default to true."
am:
eb486309d8
* commit '
eb486309d8860babc0ed5fc725009e6c53eae2dd':
Change USE_CLANG_PLATFORM_BUILD default to true.
Mike Frysinger [Fri, 11 Dec 2015 17:00:23 +0000 (09:00 -0800)]
Merge "sepolicy: drop -- marker" am:
50f21eb113
am:
86f12e6dcb
* commit '
86f12e6dcb5b321f4346f9442cb390ba032454c8':
sepolicy: drop -- marker
Chih-hung Hsieh [Fri, 11 Dec 2015 16:54:13 +0000 (16:54 +0000)]
Merge "Change USE_CLANG_PLATFORM_BUILD default to true."
Alex Klyubin [Thu, 10 Dec 2015 21:38:50 +0000 (13:38 -0800)]
Make signapk use Conscrypt.
This makes the signapk tool use Conscrypt (where possible) instead of
the platform-default JCA providers and the Bouncy Castle JCA provider.
This speeds up (by 10-30%) APK and OTA update signing because
Conscrypt's crypto primitives are backed by BoringSSL.
Previously, the signapk tool consisted only of the signapk.jar.
Because Conscrypt is backed by native code, signapk now consists of
signapk.jar and crypto_openjdk_jni shared library. This requires that
users of the tool be updated to provide a suitable -Djava.library.path
argument to the Java runtime. This change updates all known users of
the tool inside the Android source tree to do so.
Bug:
26097626
Change-Id: I8411b37d7f771ed99269751a3007dff103083552
Alex Deymo [Thu, 10 Dec 2015 02:02:56 +0000 (18:02 -0800)]
Rename libext2 host libraries to standard suffix.
libext2_uuid_host was renamed to libext2_uuid-host to match the
"-host" suffix used in most libraries.
Bug:
24619596
TEST=make dist
(cherry picked from commit
41ac44ed2b3de5cf883834490e3ed98496dd5622)
Change-Id: I07e3a5e896230ed3ce1c102c607cbd1aa02c67e0
Narayan Kamath [Thu, 10 Dec 2015 22:24:39 +0000 (22:24 +0000)]
Set -Xdoclint:none
Mac builds use a javadoc tool that fails on more warnings than linux
builds. Add -Xdoclint:none to all java 8 standard doclet javadoc
commands.
Don't add it to javadoc commands that use the com.google.doclava.Doclava
doclet, it doesn't understand -Xdoclint:none.
Change-Id: I6c2f69555ca64b028d22b06286156491f51ac86c
Chih-Hung Hsieh [Thu, 10 Dec 2015 22:13:43 +0000 (14:13 -0800)]
Change USE_CLANG_PLATFORM_BUILD default to true.
When USE_CLANG_PLATFORM_BUILD is not set, default will be clang/llvm.
USE_CLANG_PLATFORM_BUILD=false can be used to select gcc as default.
BUG:
23163853
BUG:
26102335
Change-Id: I00604c2aef4849e8c3505b2c4002eb1c46cd1fd1
Alex Deymo [Thu, 10 Dec 2015 22:28:46 +0000 (14:28 -0800)]
Merge "Rename libext2 host libraries to standard suffix."
am:
6950168f1d
* commit '
6950168f1d4bd6ddfd64755c26d7de6ef3709f00':
Rename libext2 host libraries to standard suffix.
Alex Deymo [Thu, 10 Dec 2015 22:18:34 +0000 (22:18 +0000)]
Merge "Rename libext2 host libraries to standard suffix."
Mike Frysinger [Thu, 10 Dec 2015 18:36:15 +0000 (10:36 -0800)]
Merge "sepolicy: drop -- marker"
am:
50f21eb113
* commit '
50f21eb113e533d46d9ccd112cc211070009cabc':
sepolicy: drop -- marker
Mike Frysinger [Thu, 10 Dec 2015 18:27:22 +0000 (18:27 +0000)]
Merge "sepolicy: drop -- marker"
Mike Frysinger [Thu, 10 Dec 2015 17:05:50 +0000 (12:05 -0500)]
sepolicy: drop -- marker
It's not needed and is a bit confusing.
BUG=
26018537
Change-Id: Ibb1c3995de97a442c95d5eea823523b5f0f26393
Alex Deymo [Thu, 10 Dec 2015 02:02:56 +0000 (18:02 -0800)]
Rename libext2 host libraries to standard suffix.
libext2_uuid_host was renamed to libext2_uuid-host to match the
"-host" suffix used in most libraries.
Bug:
24619596
TEST=make dist
Change-Id: Ic5faccb4d5fdbbf3d3bba6f4a35cf99d4961bb54
Dan Albert [Thu, 10 Dec 2015 00:37:26 +0000 (00:37 +0000)]
Merge "Fix the mips build." am:
0f8bd686e1
am:
064b18f155
* commit '
064b18f1558c2a2ef9a82451a8955c4bfebbbac4':
Fix the mips build.
Dan Albert [Thu, 10 Dec 2015 00:34:52 +0000 (16:34 -0800)]
Merge "Fix the mips build."
am:
0f8bd686e1
* commit '
0f8bd686e1ef6f5936d478cff4de8d9248daca35':
Fix the mips build.
Dan Albert [Thu, 10 Dec 2015 00:28:25 +0000 (00:28 +0000)]
Merge "Fix the mips build."
Dan Albert [Thu, 10 Dec 2015 00:26:20 +0000 (16:26 -0800)]
Fix the mips build.
The linker can't do --hash-style=gnu for mips.
Change-Id: I66a77067f8be6fc92ca686d3e6e159beb72cf76b
Dan Albert [Thu, 10 Dec 2015 00:24:31 +0000 (16:24 -0800)]
Merge "Add support for LOCAL_NDK_STL_VARIANT := none." am:
2ad9079305
am:
9a986a6e68
* commit '
9a986a6e682e2c22b5a63637589a88314a83316b':
Add support for LOCAL_NDK_STL_VARIANT := none.
Dan Albert [Thu, 10 Dec 2015 00:22:00 +0000 (00:22 +0000)]
Merge "Add support for LOCAL_NDK_STL_VARIANT := none."
am:
2ad9079305
* commit '
2ad9079305cc7aedfcfccf2c360c58502dc7d16e':
Add support for LOCAL_NDK_STL_VARIANT := none.
Dan Albert [Thu, 10 Dec 2015 00:17:23 +0000 (00:17 +0000)]
Merge "Add support for LOCAL_NDK_STL_VARIANT := none."
Dan Albert [Wed, 9 Dec 2015 22:46:13 +0000 (14:46 -0800)]
Add support for LOCAL_NDK_STL_VARIANT := none.
Sometimes we don't want any STL.
Change-Id: I08b4389b7882702c0e483a1456f7775fe4da1c75
Dan Albert [Wed, 9 Dec 2015 23:50:25 +0000 (23:50 +0000)]
Merge "Build NDK binaries with --hash-style=both." am:
30cb36ff5e
am:
0477dce031
* commit '
0477dce031cadff3f2b9d64fe35a3bd9afa8810f':
Build NDK binaries with --hash-style=both.
Dan Albert [Wed, 9 Dec 2015 23:48:12 +0000 (23:48 +0000)]
Merge "Build NDK binaries with --hash-style=both."
am:
30cb36ff5e
* commit '
30cb36ff5e4834800a0c4694d0ccfe9759ffea83':
Build NDK binaries with --hash-style=both.
Dan Albert [Wed, 9 Dec 2015 23:41:01 +0000 (23:41 +0000)]
Merge "Build NDK binaries with --hash-style=both."
Zach Jang [Wed, 9 Dec 2015 23:22:32 +0000 (23:22 +0000)]
DO NOT MERGE - Update security string to 2016-02-01 am:
929a4abd2b am:
af970fb308 am:
41846b0063 -s ours am:
db4d57a84c am:
02115bf55a am:
4c51cd1a9b am:
3a68198b39 am:
4d64f608c3
am:
4dbf8afb1c -s ours
* commit '
4dbf8afb1c05dc60eaa2fbe5f90e08b8455e5c93':
DO NOT MERGE - Update security string to 2016-02-01
Zach Jang [Wed, 9 Dec 2015 23:19:46 +0000 (23:19 +0000)]
Update Security String to 2016-02-01 am:
f0f73c06e2 am:
5e2b003a11 am:
8b5be4dd4f am:
1536565dc3 am:
61fc840849
am:
96c1a8cf01
* commit '
96c1a8cf01fbc00b7c888d9ad1192509498a9b9d':
Update Security String to 2016-02-01
Zach Jang [Wed, 9 Dec 2015 23:19:11 +0000 (23:19 +0000)]
DO NOT MERGE - Update security string to 2016-02-01 am:
929a4abd2b am:
af970fb308 am:
41846b0063 -s ours am:
db4d57a84c am:
02115bf55a am:
4c51cd1a9b am:
3a68198b39
am:
4d64f608c3
* commit '
4d64f608c31a616419c38e786ea73992aefb046a':
DO NOT MERGE - Update security string to 2016-02-01
Zach Jang [Wed, 9 Dec 2015 23:15:48 +0000 (23:15 +0000)]
DO NOT MERGE - Update security string to 2016-02-01 am:
929a4abd2b am:
af970fb308 am:
41846b0063 -s ours am:
db4d57a84c am:
02115bf55a am:
4c51cd1a9b
am:
3a68198b39
* commit '
3a68198b39229ed24f6749a6f491072d04f1bac8':
DO NOT MERGE - Update security string to 2016-02-01
Zach Jang [Wed, 9 Dec 2015 23:13:05 +0000 (23:13 +0000)]
DO NOT MERGE - Update security string to 2016-02-01 am:
929a4abd2b am:
af970fb308 am:
41846b0063 -s ours am:
db4d57a84c am:
02115bf55a
am:
4c51cd1a9b
* commit '
4c51cd1a9b5c41e4092aef7c5fb4cc0364873a2c':
DO NOT MERGE - Update security string to 2016-02-01
Zach Jang [Wed, 9 Dec 2015 23:09:34 +0000 (15:09 -0800)]
Update Security String to 2016-02-01 am:
f0f73c06e2 am:
5e2b003a11 am:
8b5be4dd4f am:
1536565dc3
am:
61fc840849
* commit '
61fc840849a617ddca29189b40169abbc88544f3':
Update Security String to 2016-02-01
Zach Jang [Wed, 9 Dec 2015 23:09:34 +0000 (23:09 +0000)]
DO NOT MERGE - Update security string to 2016-02-01 am:
929a4abd2b am:
af970fb308 am:
41846b0063 -s ours am:
db4d57a84c
am:
02115bf55a
* commit '
02115bf55a840790bbbca3c452a85bc97381522a':
DO NOT MERGE - Update security string to 2016-02-01
Zach Jang [Wed, 9 Dec 2015 23:06:44 +0000 (23:06 +0000)]
Update Security String to 2016-02-01 am:
f0f73c06e2 am:
5e2b003a11 am:
8b5be4dd4f
am:
1536565dc3
* commit '
1536565dc3ef67ad2e0ac7727554c29bb9638a97':
Update Security String to 2016-02-01
Zach Jang [Wed, 9 Dec 2015 23:06:44 +0000 (23:06 +0000)]
DO NOT MERGE - Update security string to 2016-02-01 am:
929a4abd2b am:
af970fb308 am:
41846b0063 -s ours
am:
db4d57a84c
* commit '
db4d57a84c8f0f6b51d9b69c2e0ec3ac825270c0':
DO NOT MERGE - Update security string to 2016-02-01
Zach Jang [Wed, 9 Dec 2015 23:03:18 +0000 (15:03 -0800)]
Update Security String to 2016-02-01 am:
f0f73c06e2 am:
5e2b003a11
am:
8b5be4dd4f
* commit '
8b5be4dd4f50266362f689d4c8f7d20fc25c5baf':
Update Security String to 2016-02-01
Zach Jang [Wed, 9 Dec 2015 23:03:18 +0000 (23:03 +0000)]
DO NOT MERGE - Update security string to 2016-02-01 am:
929a4abd2b am:
af970fb308
am:
41846b0063 -s ours
* commit '
41846b00633d3eba58193565c8f6c213006cea5d':
DO NOT MERGE - Update security string to 2016-02-01
Zach Jang [Wed, 9 Dec 2015 23:00:35 +0000 (23:00 +0000)]
Update Security String to 2016-02-01 am:
f0f73c06e2
am:
5e2b003a11
* commit '
5e2b003a116c8de6bfadf4b74d0cc676e0ed0d76':
Update Security String to 2016-02-01
Zach Jang [Wed, 9 Dec 2015 23:00:35 +0000 (23:00 +0000)]
DO NOT MERGE - Update security string to 2016-02-01 am:
929a4abd2b
am:
af970fb308
* commit '
af970fb308dd7914e8dccb56e8ea08d50e92e617':
DO NOT MERGE - Update security string to 2016-02-01
Zach Jang [Wed, 9 Dec 2015 22:57:15 +0000 (14:57 -0800)]
Update Security String to 2016-02-01
am:
f0f73c06e2
* commit '
f0f73c06e25e17ecf8e06f42c51efac102597f57':
Update Security String to 2016-02-01
Zach Jang [Wed, 9 Dec 2015 22:57:15 +0000 (14:57 -0800)]
DO NOT MERGE - Update security string to 2016-02-01
am:
929a4abd2b
* commit '
929a4abd2b777715bc730593aee87643a30706d6':
DO NOT MERGE - Update security string to 2016-02-01
Dan Albert [Wed, 9 Dec 2015 22:52:25 +0000 (14:52 -0800)]
Build NDK binaries with --hash-style=both.
Change-Id: I1c3b7415c654b783c6bb7e38a40d4c279826400f
Zach Jang [Wed, 9 Dec 2015 22:45:57 +0000 (14:45 -0800)]
DO NOT MERGE - Update security string to 2016-02-01
b/
26110717
Change-Id: Ifbb78b8c7cd5d2efa9e5501fc4e7216f336ccadc
Zach Jang [Wed, 9 Dec 2015 20:46:59 +0000 (12:46 -0800)]
Update Security String to 2016-02-01
b/
26110717
Change-Id: I1085f5d053b07c6c81d2ef22fbba5ab9157a67f2
Alex Klyubin [Tue, 8 Dec 2015 20:26:50 +0000 (20:26 +0000)]
Merge "Do not run zipalign when re-signing APKs." am:
31066abfde
am:
95ba90d1f0
* commit '
95ba90d1f0ded087683f9283b5c3538dd4f349d7':
Do not run zipalign when re-signing APKs.
Alex Klyubin [Tue, 8 Dec 2015 20:23:37 +0000 (20:23 +0000)]
Merge "Do not run zipalign when re-signing APKs."
am:
31066abfde
* commit '
31066abfde08abdefe00be67074a2c7401917f97':
Do not run zipalign when re-signing APKs.
Alex Klyubin [Tue, 8 Dec 2015 20:15:11 +0000 (20:15 +0000)]
Merge "Do not run zipalign when re-signing APKs."
Alex Klyubin [Fri, 4 Dec 2015 17:21:08 +0000 (09:21 -0800)]
Do not run zipalign when re-signing APKs.
Running zipalign is no longer needed because signapk takes care of
alignment.
Bug:
25794543
Change-Id: I1080240a67ea6f1b41585fff83d18d57fdcf44e2
Ying Wang [Tue, 8 Dec 2015 18:24:59 +0000 (18:24 +0000)]
Merge "Set -bootclasspath to "" if LOCAL_NO_STANDARD_LIBRARIES" am:
616b8a5370 am:
914a568ba0
am:
036e542c43 -s ours
* commit '
036e542c439577a636b344467f82a193f2e2cc32':
Set -bootclasspath to "" if LOCAL_NO_STANDARD_LIBRARIES
Ying Wang [Tue, 8 Dec 2015 18:03:15 +0000 (10:03 -0800)]
Merge "Set -bootclasspath to "" if LOCAL_NO_STANDARD_LIBRARIES" am:
616b8a5370
am:
914a568ba0
* commit '
914a568ba0b31fd0502b86b1d45abdf0f6ee49f1':
Set -bootclasspath to "" if LOCAL_NO_STANDARD_LIBRARIES
Ying Wang [Tue, 8 Dec 2015 17:59:55 +0000 (17:59 +0000)]
Merge "Set -bootclasspath to "" if LOCAL_NO_STANDARD_LIBRARIES"
am:
616b8a5370
* commit '
616b8a5370e6ad5cb8519fbe2c00eaa6637da260':
Set -bootclasspath to "" if LOCAL_NO_STANDARD_LIBRARIES
Ying Wang [Tue, 8 Dec 2015 17:56:05 +0000 (17:56 +0000)]
Merge "Set -bootclasspath to "" if LOCAL_NO_STANDARD_LIBRARIES"
Elliott Hughes [Tue, 8 Dec 2015 03:04:57 +0000 (03:04 +0000)]
Merge "Revert "enable -fstack-protector-strong"" am:
27ab42654e am:
fff2841298
am:
6627bc55a6
* commit '
6627bc55a677f42a2dbf325249775d4b5b3263ec':
Revert "enable -fstack-protector-strong"
Alex Klyubin [Tue, 8 Dec 2015 03:04:50 +0000 (03:04 +0000)]
Merge "Do not run zipalign when building APK (except prebuilts)." am:
b437f58006 am:
fddfc2c604
am:
60d6e2eb00
* commit '
60d6e2eb002b12c28c0f28527c020837adea9164':
Do not run zipalign when building APK (except prebuilts).
Ying Wang [Tue, 8 Dec 2015 03:04:43 +0000 (03:04 +0000)]
Merge "Fix TARGET_ASAN build." am:
9bbc67b55a am:
4f0cb0307b
am:
8d5ff73ce4
* commit '
8d5ff73ce4a3a48a414f25289ba5220f3e91f0cd':
Fix TARGET_ASAN build.
Dimitry Ivanov [Tue, 8 Dec 2015 03:04:34 +0000 (03:04 +0000)]
Merge "Include libGLESv3.so to PRODUCT_PACKAGES" am:
73661d4220 am:
973decf35c
am:
fb70c580b1
* commit '
fb70c580b1497a31ff345b36f032241fa55415b2':
Include libGLESv3.so to PRODUCT_PACKAGES
Elliott Hughes [Tue, 8 Dec 2015 03:01:32 +0000 (03:01 +0000)]
Merge "Revert "enable -fstack-protector-strong"" am:
27ab42654e
am:
fff2841298
* commit '
fff2841298afda2c80e354fc69eca543f72fdb33':
Revert "enable -fstack-protector-strong"
Alex Klyubin [Tue, 8 Dec 2015 03:01:25 +0000 (03:01 +0000)]
Merge "Do not run zipalign when building APK (except prebuilts)." am:
b437f58006
am:
fddfc2c604
* commit '
fddfc2c604bd51f11d65518a23f13ef153938500':
Do not run zipalign when building APK (except prebuilts).
Ying Wang [Tue, 8 Dec 2015 03:01:18 +0000 (03:01 +0000)]
Merge "Fix TARGET_ASAN build." am:
9bbc67b55a
am:
4f0cb0307b
* commit '
4f0cb0307b93b407abe110f3d17085d7807c137c':
Fix TARGET_ASAN build.
Dimitry Ivanov [Tue, 8 Dec 2015 03:01:12 +0000 (03:01 +0000)]
Merge "Include libGLESv3.so to PRODUCT_PACKAGES" am:
73661d4220
am:
973decf35c
* commit '
973decf35c2592d6ab9ab5ad9e94e36cd61e0c16':
Include libGLESv3.so to PRODUCT_PACKAGES
Elliott Hughes [Tue, 8 Dec 2015 02:58:25 +0000 (18:58 -0800)]
Merge "Revert "enable -fstack-protector-strong""
am:
27ab42654e
* commit '
27ab42654ebd5ffdc55bb6b727723e6980649ef9':
Revert "enable -fstack-protector-strong"
Alex Klyubin [Tue, 8 Dec 2015 02:58:19 +0000 (18:58 -0800)]
Merge "Do not run zipalign when building APK (except prebuilts)."
am:
b437f58006
* commit '
b437f58006af3d8b15eb3308ab5174da1a7c6c0d':
Do not run zipalign when building APK (except prebuilts).
Ying Wang [Tue, 8 Dec 2015 02:58:12 +0000 (18:58 -0800)]
Merge "Fix TARGET_ASAN build."
am:
9bbc67b55a
* commit '
9bbc67b55ac6876920b3ca5a73673d0a10c3fb52':
Fix TARGET_ASAN build.
Dimitry Ivanov [Tue, 8 Dec 2015 02:58:05 +0000 (18:58 -0800)]
Merge "Include libGLESv3.so to PRODUCT_PACKAGES"
am:
73661d4220
* commit '
73661d4220b85987ee5e5f34a3fc538283c19c34':
Include libGLESv3.so to PRODUCT_PACKAGES
Elliott Hughes [Tue, 8 Dec 2015 02:54:01 +0000 (02:54 +0000)]
Merge "Revert "enable -fstack-protector-strong""
Elliott Hughes [Tue, 8 Dec 2015 02:53:51 +0000 (02:53 +0000)]
Revert "enable -fstack-protector-strong"
This reverts commit
8765b1035f813be2c26988a73cf3e9815aa5adf6.
This prevents x86 from booting.
http://b/
26046864
Change-Id: Ica3f7e7e639c99fd3158df3643acb49307197881
Ying Wang [Mon, 23 Nov 2015 22:57:26 +0000 (14:57 -0800)]
Set -bootclasspath to "" if LOCAL_NO_STANDARD_LIBRARIES
Without this if a Java libraryw with LOCAL_NO_STANDARD_LIBRARIES doesn't
have core-libart in its LOCAL_JAVA_LIBRARIES, it would use core-libart
as bootclasspath but without having dependency on it.
Change-Id: I611a5a5df2bf0ad59e0be50ed1ad1afe8b843e90
(cherry-pick from commit
c6a301756cd6bc58691cde69513b28e7ee0d1ac6)
Alex Klyubin [Mon, 7 Dec 2015 22:08:14 +0000 (22:08 +0000)]
Merge "Do not run zipalign when building APK (except prebuilts)."
Ying Wang [Mon, 7 Dec 2015 20:20:59 +0000 (12:20 -0800)]
Fix missing $.
Bug:
24139963
Change-Id: Ia39cff486c51f845215976bb483baffeb9e56a80
Ying Wang [Mon, 7 Dec 2015 19:32:21 +0000 (19:32 +0000)]
Merge "Fix TARGET_ASAN build."
Dimitry Ivanov [Mon, 7 Dec 2015 19:00:58 +0000 (19:00 +0000)]
Merge "Include libGLESv3.so to PRODUCT_PACKAGES"
Ying Wang [Mon, 7 Dec 2015 18:45:19 +0000 (10:45 -0800)]
Fix TARGET_ASAN build.
Bug:
26044735
Change-Id: I9c6b3b16637ca2d0da4765e896a9f03c1d5dc51c
Nick Kralevich [Sat, 5 Dec 2015 22:29:26 +0000 (14:29 -0800)]
Merge "enable -fstack-protector-strong" am:
2a49aba35b am:
c5c2e60707
am:
a799c4beab
* commit '
a799c4beabeae4335a4b3d7fd262468ef04953c7':
enable -fstack-protector-strong
Nick Kralevich [Sat, 5 Dec 2015 22:26:46 +0000 (22:26 +0000)]
Merge "enable -fstack-protector-strong" am:
2a49aba35b
am:
c5c2e60707
* commit '
c5c2e60707cb1b5623705a78724e27efdf3cb7d5':
enable -fstack-protector-strong
Nick Kralevich [Sat, 5 Dec 2015 22:23:57 +0000 (14:23 -0800)]
Merge "enable -fstack-protector-strong"
am:
2a49aba35b
* commit '
2a49aba35b9b9216df1da245f1af13c6faa5a850':
enable -fstack-protector-strong
Nick Kralevich [Sat, 5 Dec 2015 22:20:46 +0000 (22:20 +0000)]
Merge "enable -fstack-protector-strong"
Daniel Micay [Fri, 4 Dec 2015 22:36:26 +0000 (17:36 -0500)]
enable -fstack-protector-strong
This results in nearly all functions with the possibility of stack
corruption getting stack canaries, because it applies to any function
taking a reference to the frame or with a local array rather than just
the functions with arrays larger than 8 bytes. It was developed for use
in Chrome (and Chrome OS) and has also been adopted by various other
distributions (Arch, Fedora, Ubuntu, etc).
The code size increase ranges from ~1.5% to ~2.5%, compared to ~0.3% to
~0.7% with the more conservative switch. The increase in the performance
loss is usually minimal. The overall size increase once everything other
than C and C++ code is taken into account is minimal, and it greatly
improves the mitigation of stack buffer overflow vulnerabilities.
https://lwn.net/Articles/584225/
Change-Id: Ie83d381e09d94deb34c5ff142a101ba3d14cf3ba
Ying Wang [Sat, 5 Dec 2015 02:09:06 +0000 (02:09 +0000)]
Merge "Gmake doesn\'t like newline in macro expansion result." am:
c7d5e54dfe am:
fe27825ca5
am:
82b304264e
* commit '
82b304264ea590c6d331e4d87db3167875b31c10':
Gmake doesn't like newline in macro expansion result.
Dan Willemsen [Sat, 5 Dec 2015 02:08:42 +0000 (02:08 +0000)]
Merge "Sanity check LOCAL_SRC_FILES_EXCLUDE" am:
cc3b2a5854 am:
a4769d2956
am:
2b661fe7e0
* commit '
2b661fe7e03b73be082b1d5be0d21e9c64393f4b':
Sanity check LOCAL_SRC_FILES_EXCLUDE
Ying Wang [Sat, 5 Dec 2015 00:56:12 +0000 (16:56 -0800)]
Merge "Gmake doesn\'t like newline in macro expansion result." am:
c7d5e54dfe
am:
fe27825ca5
* commit '
fe27825ca548e3f0afd869fd9dca91716c578457':
Gmake doesn't like newline in macro expansion result.
Ying Wang [Sat, 5 Dec 2015 00:53:25 +0000 (00:53 +0000)]
Merge "Gmake doesn\'t like newline in macro expansion result."
am:
c7d5e54dfe
* commit '
c7d5e54dfe71766dc60adcf06e6ec1a2b12cdda9':
Gmake doesn't like newline in macro expansion result.
Ying Wang [Sat, 5 Dec 2015 00:49:46 +0000 (00:49 +0000)]
Merge "Gmake doesn't like newline in macro expansion result."
Ying Wang [Sat, 5 Dec 2015 00:44:03 +0000 (16:44 -0800)]
Gmake doesn't like newline in macro expansion result.
When $(call func) in the makefile text expansion includes newline, gmake
reports error "missing separator". But it's fine if the expansion includes
only spaces. That's a bit odd.
This change fixes the "missing separator".
Change-Id: I094e5ae1725699ebfa4ed66544eef037dd68714c
Dan Willemsen [Fri, 4 Dec 2015 23:21:17 +0000 (23:21 +0000)]
Merge "Sanity check LOCAL_SRC_FILES_EXCLUDE" am:
cc3b2a5854
am:
a4769d2956
* commit '
a4769d2956fab9750d856c4f0990f81ff9f6759c':
Sanity check LOCAL_SRC_FILES_EXCLUDE
Dan Willemsen [Fri, 4 Dec 2015 23:17:58 +0000 (15:17 -0800)]
Merge "Sanity check LOCAL_SRC_FILES_EXCLUDE"
am:
cc3b2a5854
* commit '
cc3b2a58548832ab7a6620d6b607d315f06dfc06':
Sanity check LOCAL_SRC_FILES_EXCLUDE
Dan Willemsen [Fri, 4 Dec 2015 23:12:16 +0000 (23:12 +0000)]
Merge "Sanity check LOCAL_SRC_FILES_EXCLUDE"
Alex Klyubin [Fri, 4 Dec 2015 18:07:41 +0000 (10:07 -0800)]
Do not run zipalign when building APK (except prebuilts).
This changes the build system to no longer run zipalign except for
those prebuilts which do not need to re-signed.
Running zipalign is no longer needed because signapk takes care of
alignment. For those prebuilts which do not need to be re-signed
signapk is not invoked and thus zipalign is still needed because the
prebuilts may not have been aligned properly. This exemption will go
away once prebuilts are properly aligned.
Bug:
25794543
Change-Id: I31f10af80b9baa3c9481cb36f41e5e5046e852f9
Alex Klyubin [Fri, 4 Dec 2015 17:16:49 +0000 (17:16 +0000)]
Merge "Make signapk align .so entries to 4096 bytes." am:
dbb5527a9e am:
7f1eda800d
am:
3ad587e9ff
* commit '
3ad587e9ff6b90b80b30b82d0bc51cc40b95c85a':
Make signapk align .so entries to 4096 bytes.
Colin Cross [Fri, 4 Dec 2015 17:16:34 +0000 (17:16 +0000)]
Merge "Remove extra definition of AIDL" am:
77f411e116 am:
b275dd1623
am:
934e131465
* commit '
934e1314658b30aa8ca22766a3404ff6955d4ece':
Remove extra definition of AIDL
Alex Klyubin [Fri, 4 Dec 2015 17:13:36 +0000 (17:13 +0000)]
Merge "Make signapk align .so entries to 4096 bytes." am:
dbb5527a9e
am:
7f1eda800d
* commit '
7f1eda800d8cdb793b521e20798eaacb3fe410ad':
Make signapk align .so entries to 4096 bytes.
Alex Klyubin [Fri, 4 Dec 2015 17:10:01 +0000 (17:10 +0000)]
Merge "Make signapk align .so entries to 4096 bytes."
am:
dbb5527a9e
* commit '
dbb5527a9ef27f292794d1e51ae56d1df68c328b':
Make signapk align .so entries to 4096 bytes.
Alex Klyubin [Fri, 4 Dec 2015 17:05:27 +0000 (17:05 +0000)]
Merge "Make signapk align .so entries to 4096 bytes."
Neil Fuller [Fri, 4 Dec 2015 11:09:54 +0000 (11:09 +0000)]
Merge "Remove synchronized from the public API docs"
Dan Willemsen [Fri, 4 Dec 2015 06:58:39 +0000 (22:58 -0800)]
Sanity check LOCAL_SRC_FILES_EXCLUDE
Error out if there is a file listed in LOCAL_SRC_FILES_EXCLUDE but not in
LOCAL_SRC_FILES. This should catch typos or other mistakes that would
otherwise be missed.
Change-Id: Iaddf575a6ce35238998ac47b59591a7d05fbcd0d
Colin Cross [Fri, 4 Dec 2015 02:00:52 +0000 (02:00 +0000)]
Use prebuilt tools in place
am:
9a89ed5300 -s ours
* commit '
9a89ed5300b1288f9dd4fcfc2f0191fa9772bcb7':
Use prebuilt tools in place
Colin Cross [Thu, 3 Dec 2015 22:00:48 +0000 (22:00 +0000)]
Merge "Remove extra definition of AIDL" am:
77f411e116
am:
b275dd1623
* commit '
b275dd1623ca5256d9dfb8542cd324c624c6e9fe':
Remove extra definition of AIDL
OSDN Git Service
