Commit Graph

7231 Commits

Author SHA1 Message Date
Nick Kralevich
e128152c4c am ebe3f7a5: am 700265ce: am 69b20474: Merge "Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs"
* commit 'ebe3f7a59878d797f8f0de234f251958fee1c5af':
  Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs
2015-04-18 01:33:09 +00:00
Nick Kralevich
ebe3f7a598 am 700265ce: am 69b20474: Merge "Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs"
* commit '700265cee29c442369bfa6ee3f90bd51b79177d9':
  Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs
2015-04-18 01:00:47 +00:00
Nick Kralevich
5aa0223c6a Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs
If a prebuilt APK contains shared libraries and the flag
LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES := true is set, then
uncompress any shared libraries stored within the APK.
This allows processes to load the shared library directly from
the APK.

Bug: 20247329
Bug: 8076853
Bug: 1162500
Change-Id: Iac4db32457d9ce31eb7256410023819b44fda0a6
2015-04-17 16:53:15 -07:00
Dan Albert
c2bc25496d am 07607526: am 63082eab: am b6874440: Merge "Add support for a partial ubsan build."
* commit '07607526b8701f471869aecbd89fe4ea1990251e':
  Add support for a partial ubsan build.
2015-04-17 20:14:13 +00:00
Dan Albert
07607526b8 am 63082eab: am b6874440: Merge "Add support for a partial ubsan build."
* commit '63082eab1f1e18b06882fbbaf08ee64c3f68193a':
  Add support for a partial ubsan build.
2015-04-17 19:53:03 +00:00
Dmitriy Ivanov
cc39abfdd2 am a6c44859: am bc671bc6: am e3aa1c1f: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
* commit 'a6c44859c5344d489526641ce5a08598254da57b':
  Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
2015-04-17 19:42:55 +00:00
Dan Albert
b687444051 Merge "Add support for a partial ubsan build." 2015-04-17 19:33:02 +00:00
Dan Albert
5da97b217a am 048b3eb0: am 7a1d29eb: am 1d8f780c: Merge "Fix misuse of my_sanitize_host."
* commit '048b3eb0170b8816cd97400a43f7f1523c19c210':
  Fix misuse of my_sanitize_host.
2015-04-17 19:30:22 +00:00
Dan Albert
c08f725cd8 am 757417f9: am f1b7c073: am 6ed5bea4: Merge "Make use of sanitizers without clang an error."
* commit '757417f9438a3a83d9fa1f7b10d74436fd6f61e4':
  Make use of sanitizers without clang an error.
2015-04-17 19:30:20 +00:00
Dmitriy Ivanov
a6c44859c5 am bc671bc6: am e3aa1c1f: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
* commit 'bc671bc65ee8db4ba0bba33543d41d372f424f9d':
  Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
2015-04-17 19:20:25 +00:00
Dan Albert
048b3eb017 am 7a1d29eb: am 1d8f780c: Merge "Fix misuse of my_sanitize_host."
* commit '7a1d29eb4bea37a4f043330cf722f720103129b8':
  Fix misuse of my_sanitize_host.
2015-04-17 19:09:00 +00:00
Dan Albert
757417f943 am f1b7c073: am 6ed5bea4: Merge "Make use of sanitizers without clang an error."
* commit 'f1b7c073a4d1b3f47811b6b9e85c6589d293c373':
  Make use of sanitizers without clang an error.
2015-04-17 19:08:59 +00:00
Dmitriy Ivanov
e3aa1c1f85 Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS" 2015-04-17 18:50:13 +00:00
Dmitriy Ivanov
8f9487431c Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
Use LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES instead.

Change-Id: Id30529fbc1652d066e0008813352848b5e404ab9
2015-04-17 11:39:04 -07:00
Dan Albert
b5b2ffe3be Add support for a partial ubsan build.
Some of the ubsan checks expose a few pathological performance cases
in clang, and thus aren't suited to be used in SANITIZE_HOST.

This mode is also supported on the target despite not having the
target runtime libraries for ubsan by generating traps.

Change-Id: I0b0f0a08ca84d72e44e2174a66726b1c5e5cad7e
2015-04-17 11:37:03 -07:00
Dan Albert
4c92a68127 Fix misuse of my_sanitize_host.
Ying pointed out in https://android-review.googlesource.com/#/c/147290
that my_sanitize_host would be read as some garbage value for target
builds. Move the configuration later and don't use the local at all.

Change-Id: Id8a095821d000a184e72f950b9481597073a7044
2015-04-17 11:32:57 -07:00
Dan Albert
94b579166f Make use of sanitizers without clang an error.
Previously using a sanitizer would imply clang. It should be an error
instead so it's more obvious.

Change-Id: I67c949bfda3718a0d19da7e358b5fde447fce334
2015-04-17 11:06:24 -07:00
Dan Albert
f52cf64f6c am fad70977: am cf6e1ff6: am 27176208: Merge "Clean up sanitizer configuration."
* commit 'fad709772e766ce83b4667e89a25a7f0d90ca5f8':
  Clean up sanitizer configuration.
2015-04-17 17:32:23 +00:00
Dan Albert
fad709772e am cf6e1ff6: am 27176208: Merge "Clean up sanitizer configuration."
* commit 'cf6e1ff62a0abbea186d5a62f23d0b71671202ca':
  Clean up sanitizer configuration.
2015-04-17 17:08:55 +00:00
Dan Albert
27ccb75af7 Clean up sanitizer configuration.
* Refactor a few pieces to avoid deeply nested conditionals.
 * LOCAL_SANITIZE := never replaces LOCAL_ADDRESS_SANITIZER := false.

Change-Id: I68bb8c5edda6ecd40179c5ba9f18d06e96aaa260
2015-04-17 09:39:12 -07:00
Dan Albert
97952ce8ac am 3bc25d69: am 683a387e: am 4ed95088: Merge "Add support for ubsan."
* commit '3bc25d69580b5cdedd834fe6accf9cc27c0fb102':
  Add support for ubsan.
2015-04-15 22:56:21 +00:00
Dan Albert
3bc25d6958 am 683a387e: am 4ed95088: Merge "Add support for ubsan."
* commit '683a387efb079fefd3d2895875868b7c2a5a4a06':
  Add support for ubsan.
2015-04-15 22:32:08 +00:00
Dan Albert
4ed9508842 Merge "Add support for ubsan." 2015-04-15 22:06:15 +00:00
Ying Wang
87a21c8b89 resolved conflicts for merge of eec386a4 to master
Change-Id: Ia686e67ed480427a6422d87bef2dcd4e44e27266
2015-04-15 14:39:26 -07:00
Kenny Root
eec386a4df am 68dc5196: am 03c6e8c5: Merge "Move package signing after file stripping"
* commit '68dc5196226406db84a41a03fe70e6278ed35fcd':
  Move package signing after file stripping
2015-04-15 20:12:21 +00:00
Kenny Root
dff3755a93 Move package signing after file stripping
For dex preopt and JNI library extraction, we should remove the
classes.dex and .so files before we sign the APK so that there
isn't an entry in the manifest.

Prebuilt APKs which are pre-signed will simply not have the files
removed. This may cause some system.img bloat, but signature checks make
this necessary.

Bug: 20247329
Change-Id: I4742d1aa3aa64ab5aea2264304cb8c0bea24f784
2015-04-15 12:40:22 -07:00
Ying Wang
599b07a4b2 Merge "Auto-clean host tools when switching between apps_only and platform build." 2015-04-15 17:10:05 +00:00
Mark Salyzyn
4660814b51 am d6d6077c: am 2f1bc255: am 8b75ec1c: Merge "disttools: add liblog, libcutils and libselinux shared libraries"
* commit 'd6d6077c999e4ef335312f2740d5d7ad20572f79':
  disttools: add liblog, libcutils and libselinux shared libraries
2015-04-15 15:28:39 +00:00
Mark Salyzyn
d6d6077c99 am 2f1bc255: am 8b75ec1c: Merge "disttools: add liblog, libcutils and libselinux shared libraries"
* commit '2f1bc255fc7f0f5a8f6fd96296a119120bc04726':
  disttools: add liblog, libcutils and libselinux shared libraries
2015-04-15 15:05:55 +00:00
Mark Salyzyn
8b75ec1c7b Merge "disttools: add liblog, libcutils and libselinux shared libraries" 2015-04-15 14:45:05 +00:00
Yohann Roussel
77cbe10fd9 Use Jack launcher
Bug: 20132430
Change-Id: I6e30ad3dffbb32824a4c62e562359b084e6a8784
2015-04-15 12:29:01 +02:00
Dan Albert
cbdd2c348f am 1fa6d5b0: am 612581e8: am ad1961a7: Merge "Don\'t use libunwindbacktrace for non-ARM."
* commit '1fa6d5b0a3fc873bce4d16056c115bf30e62a147':
  Don't use libunwindbacktrace for non-ARM.
2015-04-14 23:56:11 +00:00
Dan Albert
1fa6d5b0a3 am 612581e8: am ad1961a7: Merge "Don\'t use libunwindbacktrace for non-ARM."
* commit '612581e8ca8bda8c7f74e84fbb9b7859ca3b9840':
  Don't use libunwindbacktrace for non-ARM.
2015-04-14 23:34:03 +00:00
Dan Albert
ad1961a747 Merge "Don't use libunwindbacktrace for non-ARM." 2015-04-14 23:17:41 +00:00
Dan Albert
c2ac7201a7 am 803cf699: am 5e7e6d75: am 2d215e38: Merge "Use libcompiler_rt-extras on the host too."
* commit '803cf699262275a771e3211751e77d2817718656':
  Use libcompiler_rt-extras on the host too.
2015-04-14 23:08:47 +00:00
Dan Albert
803cf69926 am 5e7e6d75: am 2d215e38: Merge "Use libcompiler_rt-extras on the host too."
* commit '5e7e6d7585ff94198a5ddd891faba274cf2416d6':
  Use libcompiler_rt-extras on the host too.
2015-04-14 22:48:57 +00:00
Mark Salyzyn
c506e74dc8 disttools: add liblog, libcutils and libselinux shared libraries
Bug: 19908228
Change-Id: I48450a9fb917408cb3bc0e41d70c0593acd2b884
2015-04-14 15:17:16 -07:00
Dan Albert
2d215e38c0 Merge "Use libcompiler_rt-extras on the host too." 2015-04-14 22:04:56 +00:00
Dan Albert
3e99e66213 Don't use libunwindbacktrace for non-ARM.
After fixing the link order here, it seems libunwindbacktrace no
longer works for exception unwinding, but libgcc now does.

Change-Id: Ice79af4b8f234ed6a053ee818b6dec3aa9706c8a
2015-04-14 14:42:45 -07:00
Ying Wang
036b53b6de Auto-clean host tools when switching between apps_only and platform build.
For apps_only (also PDK build) we use prebuilt host tools in
prebuilts/sdk/tools; For platform build we use tools built from source.
Auto-clean intermediate files of these tools when build type change is
detected.

Bug: 20213206
Change-Id: I9173af322684c017fdb91a3abfbe39ecfe5650e9
2015-04-14 14:14:19 -07:00
Andrew Hsieh
1849365e7b am 263e22d4: am 051f18f0: am f37e96e2: Merge "Revert "Enable linker -fix-cortex-a53-843419""
* commit '263e22d424a80de023143c4758e1e534c726a07d':
  Revert "Enable linker -fix-cortex-a53-843419"
2015-04-14 03:01:10 +00:00
Andrew Hsieh
263e22d424 am 051f18f0: am f37e96e2: Merge "Revert "Enable linker -fix-cortex-a53-843419""
* commit '051f18f0dce3d0e6278d5bd9b2aad03974549fb5':
  Revert "Enable linker -fix-cortex-a53-843419"
2015-04-14 00:08:51 +00:00
Andrew Hsieh
f37e96e232 Merge "Revert "Enable linker -fix-cortex-a53-843419"" 2015-04-13 23:48:28 +00:00
Andrew Hsieh
32e1689684 Revert "Enable linker -fix-cortex-a53-843419"
This reverts commit 54b22a5a70.

Change-Id: I23613490030783fb6da678de5a25f37caebe5f97
2015-04-13 23:39:45 +00:00
David Srbecky
b8b9fc72af am ace60518: am 6bb41928: am c8400a3e: Merge "Add --include-cfi compiler option."
* commit 'ace60518c3a19fae779b350795ac3d46d2833feb':
  Add --include-cfi compiler option.
2015-04-13 21:13:22 +00:00
David Srbecky
ace60518c3 am 6bb41928: am c8400a3e: Merge "Add --include-cfi compiler option."
* commit '6bb41928e4fe2673a036a4bfa1625c5598cf14f1':
  Add --include-cfi compiler option.
2015-04-13 20:51:53 +00:00
David Srbecky
c8400a3e2f Merge "Add --include-cfi compiler option." 2015-04-13 20:34:50 +00:00
David Srbecky
299d3f4960 Add --include-cfi compiler option.
Decouple generation of CFI from the rest of debug symbols.
This makes it possible to generate oat with CFI but without
the rest of debug symbols.

This is in line with intention of the .eh_frame section.
The section does not have the .debug_ prefix because it
is considered somewhat different to the rest of debug symbols.

Change-Id: I32816ecd4f30ac4e0dc69d69a4993e349c737f96
2015-04-13 19:50:51 +01:00
Andrew Hsieh
93b8969085 am 00b0f345: am 45c4c5af: am 7bd978c2: Merge "Enable linker -fix-cortex-a53-843419"
* commit '00b0f345b62065979dbebb648e4d549953577ac3':
  Enable linker -fix-cortex-a53-843419
2015-04-13 03:38:35 +00:00
Andrew Hsieh
00b0f345b6 am 45c4c5af: am 7bd978c2: Merge "Enable linker -fix-cortex-a53-843419"
* commit '45c4c5af9e226231167d374b27e30c6bf0e073ea':
  Enable linker -fix-cortex-a53-843419
2015-04-13 03:16:51 +00:00