Alex Klyubin
dfd2199ef6
Merge "Make signapk use Conscrypt."
...
am: 7884a63731
* commit '7884a63731a876f483c13288c87d8e7af7a533e4':
Make signapk use Conscrypt.
2015-12-11 10:37:16 -08:00
Alex Klyubin
7884a63731
Merge "Make signapk use Conscrypt."
2015-12-11 18:29:36 +00:00
Chih-hung Hsieh
a3fbb3b0e4
Merge "Change USE_CLANG_PLATFORM_BUILD default to true."
...
am: eb486309d8
* commit 'eb486309d8860babc0ed5fc725009e6c53eae2dd':
Change USE_CLANG_PLATFORM_BUILD default to true.
2015-12-11 09:08:07 -08:00
Chih-hung Hsieh
eb486309d8
Merge "Change USE_CLANG_PLATFORM_BUILD default to true."
2015-12-11 16:54:13 +00:00
Alex Klyubin
9667b18f23
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
2015-12-11 08:36:42 -08:00
Chih-Hung Hsieh
3c8036da53
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
2015-12-10 14:41:55 -08:00
Alex Deymo
2001743c7a
Merge "Rename libext2 host libraries to standard suffix."
...
am: 6950168f1d
* commit '6950168f1d4bd6ddfd64755c26d7de6ef3709f00':
Rename libext2 host libraries to standard suffix.
2015-12-10 14:28:46 -08:00
Alex Deymo
6950168f1d
Merge "Rename libext2 host libraries to standard suffix."
2015-12-10 22:18:34 +00:00
Mike Frysinger
86f12e6dcb
Merge "sepolicy: drop -- marker"
...
am: 50f21eb113
* commit '50f21eb113e533d46d9ccd112cc211070009cabc':
sepolicy: drop -- marker
2015-12-10 10:36:15 -08:00
Mike Frysinger
50f21eb113
Merge "sepolicy: drop -- marker"
2015-12-10 18:27:22 +00:00
Mike Frysinger
db4883ca93
sepolicy: drop -- marker
...
It's not needed and is a bit confusing.
BUG=26018537
Change-Id: Ibb1c3995de97a442c95d5eea823523b5f0f26393
2015-12-10 18:18:27 +00:00
Alex Deymo
41ac44ed2b
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
2015-12-09 18:02:56 -08:00
Dan Albert
064b18f155
Merge "Fix the mips build."
...
am: 0f8bd686e1
* commit '0f8bd686e1ef6f5936d478cff4de8d9248daca35':
Fix the mips build.
2015-12-09 16:34:52 -08:00
Dan Albert
0f8bd686e1
Merge "Fix the mips build."
2015-12-10 00:28:25 +00:00
Dan Albert
8dca15f287
Fix the mips build.
...
The linker can't do --hash-style=gnu for mips.
Change-Id: I66a77067f8be6fc92ca686d3e6e159beb72cf76b
2015-12-09 16:26:20 -08:00
Dan Albert
9a986a6e68
Merge "Add support for LOCAL_NDK_STL_VARIANT := none."
...
am: 2ad9079305
* commit '2ad9079305cc7aedfcfccf2c360c58502dc7d16e':
Add support for LOCAL_NDK_STL_VARIANT := none.
2015-12-10 00:22:00 +00:00
Dan Albert
2ad9079305
Merge "Add support for LOCAL_NDK_STL_VARIANT := none."
2015-12-10 00:17:23 +00:00
Dan Albert
0e2e71dc2e
Add support for LOCAL_NDK_STL_VARIANT := none.
...
Sometimes we don't want any STL.
Change-Id: I08b4389b7882702c0e483a1456f7775fe4da1c75
2015-12-09 15:59:17 -08:00
Dan Albert
0477dce031
Merge "Build NDK binaries with --hash-style=both."
...
am: 30cb36ff5e
* commit '30cb36ff5e4834800a0c4694d0ccfe9759ffea83':
Build NDK binaries with --hash-style=both.
2015-12-09 23:48:12 +00:00
Dan Albert
30cb36ff5e
Merge "Build NDK binaries with --hash-style=both."
2015-12-09 23:41:01 +00:00
Zach Jang
4dbf8afb1c
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
2015-12-09 23:19:11 +00:00
Zach Jang
4d64f608c3
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
2015-12-09 23:15:48 +00:00
Zach Jang
3a68198b39
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
2015-12-09 23:13:05 +00:00
Zach Jang
96c1a8cf01
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
2015-12-09 15:09:34 -08:00
Zach Jang
4c51cd1a9b
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
2015-12-09 23:09:34 +00:00
Zach Jang
61fc840849
Update Security String to 2016-02-01 am: f0f73c06e2
am: 5e2b003a11
am: 8b5be4dd4f
...
am: 1536565dc3
* commit '1536565dc3ef67ad2e0ac7727554c29bb9638a97':
Update Security String to 2016-02-01
2015-12-09 23:06:44 +00:00
Zach Jang
02115bf55a
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
2015-12-09 23:06:44 +00:00
Zach Jang
1536565dc3
Update Security String to 2016-02-01 am: f0f73c06e2
am: 5e2b003a11
...
am: 8b5be4dd4f
* commit '8b5be4dd4f50266362f689d4c8f7d20fc25c5baf':
Update Security String to 2016-02-01
2015-12-09 15:03:18 -08:00
Zach Jang
db4d57a84c
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
2015-12-09 23:03:18 +00:00
Zach Jang
8b5be4dd4f
Update Security String to 2016-02-01 am: f0f73c06e2
...
am: 5e2b003a11
* commit '5e2b003a116c8de6bfadf4b74d0cc676e0ed0d76':
Update Security String to 2016-02-01
2015-12-09 23:00:35 +00:00
Zach Jang
41846b0063
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
2015-12-09 23:00:35 +00:00
Zach Jang
5e2b003a11
Update Security String to 2016-02-01
...
am: f0f73c06e2
* commit 'f0f73c06e25e17ecf8e06f42c51efac102597f57':
Update Security String to 2016-02-01
2015-12-09 14:57:15 -08:00
Zach Jang
af970fb308
DO NOT MERGE - Update security string to 2016-02-01
...
am: 929a4abd2b
* commit '929a4abd2b777715bc730593aee87643a30706d6':
DO NOT MERGE - Update security string to 2016-02-01
2015-12-09 14:57:15 -08:00
Dan Albert
ee629c9ffb
Build NDK binaries with --hash-style=both.
...
Change-Id: I1c3b7415c654b783c6bb7e38a40d4c279826400f
2015-12-09 14:52:25 -08:00
Zach Jang
929a4abd2b
DO NOT MERGE - Update security string to 2016-02-01
...
b/26110717
Change-Id: Ifbb78b8c7cd5d2efa9e5501fc4e7216f336ccadc
2015-12-09 14:45:57 -08:00
Zach Jang
f0f73c06e2
Update Security String to 2016-02-01
...
b/26110717
Change-Id: I1085f5d053b07c6c81d2ef22fbba5ab9157a67f2
2015-12-09 20:48:10 +00:00
Alex Klyubin
95ba90d1f0
Merge "Do not run zipalign when re-signing APKs."
...
am: 31066abfde
* commit '31066abfde08abdefe00be67074a2c7401917f97':
Do not run zipalign when re-signing APKs.
2015-12-08 20:23:37 +00:00
Alex Klyubin
31066abfde
Merge "Do not run zipalign when re-signing APKs."
2015-12-08 20:15:11 +00:00
Alex Klyubin
eb756d7b7b
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
2015-12-08 11:05:13 -08:00
Ying Wang
036e542c43
Merge "Set -bootclasspath to "" if LOCAL_NO_STANDARD_LIBRARIES" am: 616b8a5370
...
am: 914a568ba0
* commit '914a568ba0b31fd0502b86b1d45abdf0f6ee49f1':
Set -bootclasspath to "" if LOCAL_NO_STANDARD_LIBRARIES
2015-12-08 10:03:15 -08:00
Ying Wang
914a568ba0
Merge "Set -bootclasspath to "" if LOCAL_NO_STANDARD_LIBRARIES"
...
am: 616b8a5370
* commit '616b8a5370e6ad5cb8519fbe2c00eaa6637da260':
Set -bootclasspath to "" if LOCAL_NO_STANDARD_LIBRARIES
2015-12-08 17:59:55 +00:00
Ying Wang
616b8a5370
Merge "Set -bootclasspath to "" if LOCAL_NO_STANDARD_LIBRARIES"
2015-12-08 17:56:05 +00:00
Elliott Hughes
6627bc55a6
Merge "Revert "enable -fstack-protector-strong"" am: 27ab42654e
...
am: fff2841298
* commit 'fff2841298afda2c80e354fc69eca543f72fdb33':
Revert "enable -fstack-protector-strong"
2015-12-08 03:01:32 +00:00
Alex Klyubin
60d6e2eb00
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).
2015-12-08 03:01:25 +00:00
Ying Wang
8d5ff73ce4
Merge "Fix TARGET_ASAN build." am: 9bbc67b55a
...
am: 4f0cb0307b
* commit '4f0cb0307b93b407abe110f3d17085d7807c137c':
Fix TARGET_ASAN build.
2015-12-08 03:01:18 +00:00
Dimitry Ivanov
fb70c580b1
Merge "Include libGLESv3.so to PRODUCT_PACKAGES" am: 73661d4220
...
am: 973decf35c
* commit '973decf35c2592d6ab9ab5ad9e94e36cd61e0c16':
Include libGLESv3.so to PRODUCT_PACKAGES
2015-12-08 03:01:12 +00:00
Elliott Hughes
fff2841298
Merge "Revert "enable -fstack-protector-strong""
...
am: 27ab42654e
* commit '27ab42654ebd5ffdc55bb6b727723e6980649ef9':
Revert "enable -fstack-protector-strong"
2015-12-07 18:58:25 -08:00
Alex Klyubin
fddfc2c604
Merge "Do not run zipalign when building APK (except prebuilts)."
...
am: b437f58006
* commit 'b437f58006af3d8b15eb3308ab5174da1a7c6c0d':
Do not run zipalign when building APK (except prebuilts).
2015-12-07 18:58:19 -08:00
Ying Wang
4f0cb0307b
Merge "Fix TARGET_ASAN build."
...
am: 9bbc67b55a
* commit '9bbc67b55ac6876920b3ca5a73673d0a10c3fb52':
Fix TARGET_ASAN build.
2015-12-07 18:58:12 -08:00
Dimitry Ivanov
973decf35c
Merge "Include libGLESv3.so to PRODUCT_PACKAGES"
...
am: 73661d4220
* commit '73661d4220b85987ee5e5f34a3fc538283c19c34':
Include libGLESv3.so to PRODUCT_PACKAGES
2015-12-07 18:58:05 -08:00