summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* am 893ed24d: am 387a9fee: am 941d61de: am 1ff47c7f: Merge "Revert "Pack ↵Dimitry Ivanov2015-04-2310-45/+15
|\ | | | | | | | | | | | | relocation tables for all dynamic executables"" * commit '893ed24dd7cec9b560fe46862b3635efa327ec65': Revert "Pack relocation tables for all dynamic executables"
| * am 941d61de: am 1ff47c7f: Merge "Revert "Pack relocation tables for all ↵Dimitry Ivanov2015-04-2310-45/+15
| |\ | | | | | | | | | | | | | | | | | | dynamic executables"" * commit '941d61decc24cc28c781d0593b2a5d0589b4a7ad': Revert "Pack relocation tables for all dynamic executables"
| | * Revert "Pack relocation tables for all dynamic executables"Dimitry Ivanov2015-04-2310-45/+15
| | | | | | | | | | | | | | | | | | This reverts commit e7a1b8a0c6d5f56e415345a0aceef3afe5ff5eff. Change-Id: I1a2185e1c68d364941e3b3e525a8c4a7a42e0cc1
* | | am ff084258: am b7b27621: am 64119a7f: am ec6a9773: Merge "Pack relocation ↵Dmitriy Ivanov2015-04-2310-15/+45
|\ \ \ | |/ / | | | | | | | | | | | | | | | tables for all dynamic executables" * commit 'ff084258ea53c414d724ba87f89c324056def1bd': Pack relocation tables for all dynamic executables
| * | am 64119a7f: am ec6a9773: Merge "Pack relocation tables for all dynamic ↵Dmitriy Ivanov2015-04-2310-15/+45
| |\ \ | | |/ | | | | | | | | | | | | | | | executables" * commit '64119a7ff23960615c607306c9190c1def622d23': Pack relocation tables for all dynamic executables
| | * Pack relocation tables for all dynamic executablesDmitriy Ivanov2015-04-2210-15/+45
| | | | | | | | | | | | | | | Bug: http://b/18051137 Change-Id: I277277d5f5eb450ef9b4a23cfec16d75d977eb89
* | | resolved conflicts for merge of b9e4848e to masterdcashman2015-04-221-1/+5
|\ \ \ | |/ / | | | | | | Change-Id: Ia1ea1c3cf7669c2eeaefa1f10c511aa1e782386b
| * | am 780bdd6a: am ab59266d: Merge "Add lib dirs to cts distribution."dcashman2015-04-221-2/+6
| |\ \ | | |/ | | | | | | | | | * commit '780bdd6a1363cfe2fb9425647e0458dd2aee43f4': Add lib dirs to cts distribution.
| | * Merge "Add lib dirs to cts distribution."dcashman2015-04-221-2/+6
| | |\
| | | * Add lib dirs to cts distribution.dcashman2015-04-211-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ability to include dirs to the cts distribtion to enable bundling of shared libraries on which host-side executables rely. Bug: 19566396 Change-Id: Id501874244ae98fbfef2aa591885c88dee5b8b02
* | | | resolved conflicts for merge of 6cb3732d to masterDmitriy Ivanov2015-04-204-32/+2
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I6415638ccde1e78f74ae5d9527dc696d40f15e5f
| * | | am baca453a: am 5beb3387: Merge "Remove unsupported *_COMPRESS_MODULE_SYMBOLS"Dmitriy Ivanov2015-04-204-32/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'baca453a7d23fb2cf8a38d8aad3addbfce362afc': Remove unsupported *_COMPRESS_MODULE_SYMBOLS
| | * | Remove unsupported *_COMPRESS_MODULE_SYMBOLSDmitriy Ivanov2015-04-204-32/+2
| | |/ | | | | | | | | | Change-Id: Ibb7da2997a0bb5b9f435213c9d3206bc4aad18db
* | | Error out if LOCAL_PREBUILT_JNI_LIBS and LOCAL_CERTIFICATE := PRESIGNED are usedNick Kralevich2015-04-181-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LOCAL_PREBUILT_JNI_LIBS is an indication to the build system that all shared libraries should be deleted from an APK, and the shared libraries should be placed in the application's /system/app directory. However, using this option isn't appropriate for pre-signed APKs. Any attempt to delete files from a pre-signed APK will corrupt it's signature or waste disk space. Bug: 20247329 Bug: 8076853 Bug: 1162500 Change-Id: I89ce8f06d3889dd79dd9ffe86fc5fa60814498ad
* | | am ebe3f7a5: am 700265ce: am 69b20474: Merge "Support ↵Nick Kralevich2015-04-182-0/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs" * commit 'ebe3f7a59878d797f8f0de234f251958fee1c5af': Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs
| * | am 700265ce: am 69b20474: Merge "Support ↵Nick Kralevich2015-04-182-0/+13
| |\ \ | | |/ | | | | | | | | | | | | | | | LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs" * commit '700265cee29c442369bfa6ee3f90bd51b79177d9': Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs
| | * Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKsNick Kralevich2015-04-172-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 07607526: am 63082eab: am b6874440: Merge "Add support for a partial ↵Dan Albert2015-04-172-4/+34
|\ \ \ | |/ / | | | | | | | | | | | | | | | ubsan build." * commit '07607526b8701f471869aecbd89fe4ea1990251e': Add support for a partial ubsan build.
| * | am 63082eab: am b6874440: Merge "Add support for a partial ubsan build."Dan Albert2015-04-172-4/+34
| |\ \ | | |/ | | | | | | | | | * commit '63082eab1f1e18b06882fbbaf08ee64c3f68193a': Add support for a partial ubsan build.
| | * Merge "Add support for a partial ubsan build."Dan Albert2015-04-172-4/+34
| | |\
| | | * Add support for a partial ubsan build.Dan Albert2015-04-172-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am a6c44859: am bc671bc6: am e3aa1c1f: Merge "Remove ↵Dmitriy Ivanov2015-04-173-4/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS" * commit 'a6c44859c5344d489526641ce5a08598254da57b': Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
| * | | am bc671bc6: am e3aa1c1f: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"Dmitriy Ivanov2015-04-173-4/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'bc671bc65ee8db4ba0bba33543d41d372f424f9d': Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
| | * | Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"Dmitriy Ivanov2015-04-173-4/+3
| | |\ \ | | | |/ | | |/|
| | | * Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONSDmitriy Ivanov2015-04-173-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | Use LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES instead. Change-Id: Id30529fbc1652d066e0008813352848b5e404ab9
* | | | am 048b3eb0: am 7a1d29eb: am 1d8f780c: Merge "Fix misuse of my_sanitize_host."Dan Albert2015-04-171-19/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '048b3eb0170b8816cd97400a43f7f1523c19c210': Fix misuse of my_sanitize_host.
| * | | am 7a1d29eb: am 1d8f780c: Merge "Fix misuse of my_sanitize_host."Dan Albert2015-04-171-19/+17
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '7a1d29eb4bea37a4f043330cf722f720103129b8': Fix misuse of my_sanitize_host.
| | * | Fix misuse of my_sanitize_host.Dan Albert2015-04-171-19/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 757417f9: am f1b7c073: am 6ed5bea4: Merge "Make use of sanitizers without ↵Dan Albert2015-04-171-4/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | clang an error." * commit '757417f9438a3a83d9fa1f7b10d74436fd6f61e4': Make use of sanitizers without clang an error.
| * | | am f1b7c073: am 6ed5bea4: Merge "Make use of sanitizers without clang an error."Dan Albert2015-04-171-4/+11
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'f1b7c073a4d1b3f47811b6b9e85c6589d293c373': Make use of sanitizers without clang an error.
| | * | Make use of sanitizers without clang an error.Dan Albert2015-04-171-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously using a sanitizer would imply clang. It should be an error instead so it's more obvious. Change-Id: I67c949bfda3718a0d19da7e358b5fde447fce334
* | | | am fad70977: am cf6e1ff6: am 27176208: Merge "Clean up sanitizer configuration."Dan Albert2015-04-171-6/+23
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'fad709772e766ce83b4667e89a25a7f0d90ca5f8': Clean up sanitizer configuration.
| * | | am cf6e1ff6: am 27176208: Merge "Clean up sanitizer configuration."Dan Albert2015-04-171-6/+23
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'cf6e1ff62a0abbea186d5a62f23d0b71671202ca': Clean up sanitizer configuration.
| | * | Clean up sanitizer configuration.Dan Albert2015-04-171-6/+23
| | |/ | | | | | | | | | | | | | | | | | | * Refactor a few pieces to avoid deeply nested conditionals. * LOCAL_SANITIZE := never replaces LOCAL_ADDRESS_SANITIZER := false. Change-Id: I68bb8c5edda6ecd40179c5ba9f18d06e96aaa260
* | | am 3bc25d69: am 683a387e: am 4ed95088: Merge "Add support for ubsan."Dan Albert2015-04-153-9/+46
|\ \ \ | |/ / | | | | | | | | | * commit '3bc25d69580b5cdedd834fe6accf9cc27c0fb102': Add support for ubsan.
| * | am 683a387e: am 4ed95088: Merge "Add support for ubsan."Dan Albert2015-04-153-9/+46
| |\ \ | | |/ | | | | | | | | | * commit '683a387efb079fefd3d2895875868b7c2a5a4a06': Add support for ubsan.
| | * Merge "Add support for ubsan."Dan Albert2015-04-153-9/+46
| | |\
| | | * Add support for ubsan.Dan Albert2015-04-083-9/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than adding LOCAL_UB_SANITIZER, LOCAL_THREAD_SANITIZER, etc for each new sanitizer, deprecate LOCAL_ADDRESS_SANITIZER in favor of LOCAL_SANITZE that mirrors the behavior of -fsanitize=<sanitizers>. For example, the following will use both asan and ubsan: LOCAL_SANITIZE := address undefined We'll leave LOCAL_ADDRESS_SANITIZER around for compatibility until we can clean up the tree. Change-Id: I8a62315129d4753f8e992584ca6db1e5dfdd4d2a
* | | | resolved conflicts for merge of eec386a4 to masterYing Wang2015-04-152-4/+5
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Ia686e67ed480427a6422d87bef2dcd4e44e27266
| * | | am 68dc5196: am 03c6e8c5: Merge "Move package signing after file stripping"Kenny Root2015-04-152-4/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '68dc5196226406db84a41a03fe70e6278ed35fcd': Move package signing after file stripping
| | * | Move package signing after file strippingKenny Root2015-04-152-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Auto-clean host tools when switching between apps_only and platform ↵Ying Wang2015-04-151-1/+42
|\ \ \ \ | | | | | | | | | | | | | | | build."
| * | | | Auto-clean host tools when switching between apps_only and platform build.Ying Wang2015-04-141-1/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am d6d6077c: am 2f1bc255: am 8b75ec1c: Merge "disttools: add liblog, ↵Mark Salyzyn2015-04-151-1/+4
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | libcutils and libselinux shared libraries" * commit 'd6d6077c999e4ef335312f2740d5d7ad20572f79': disttools: add liblog, libcutils and libselinux shared libraries
| * | | | am 2f1bc255: am 8b75ec1c: Merge "disttools: add liblog, libcutils and ↵Mark Salyzyn2015-04-151-1/+4
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | libselinux shared libraries" * commit '2f1bc255fc7f0f5a8f6fd96296a119120bc04726': disttools: add liblog, libcutils and libselinux shared libraries
| | * | | Merge "disttools: add liblog, libcutils and libselinux shared libraries"Mark Salyzyn2015-04-151-1/+4
| | |\ \ \
| | | * | | disttools: add liblog, libcutils and libselinux shared librariesMark Salyzyn2015-04-141-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19908228 Change-Id: I48450a9fb917408cb3bc0e41d70c0593acd2b884
* | | | | | Use Jack launcherYohann Roussel2015-04-155-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20132430 Change-Id: I6e30ad3dffbb32824a4c62e562359b084e6a8784
* | | | | | am 1fa6d5b0: am 612581e8: am ad1961a7: Merge "Don\'t use libunwindbacktrace ↵Dan Albert2015-04-141-2/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for non-ARM." * commit '1fa6d5b0a3fc873bce4d16056c115bf30e62a147': Don't use libunwindbacktrace for non-ARM.
| * | | | | am 612581e8: am ad1961a7: Merge "Don\'t use libunwindbacktrace for non-ARM."Dan Albert2015-04-141-2/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '612581e8ca8bda8c7f74e84fbb9b7859ca3b9840': Don't use libunwindbacktrace for non-ARM.