summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* am 519751a8: Merge "There\'s no such thing as _THREAD_SAFE."Elliott Hughes2015-04-031-5/+0
|\ | | | | | | | | * commit '519751a88217e6fdc3b86979ffaf61ff03d92312': There's no such thing as _THREAD_SAFE.
| * There's no such thing as _THREAD_SAFE.Elliott Hughes2015-04-031-5/+0
| | | | | | | | | | | | | | At least, as far as I can tell from the internet and from grep in /usr/include on a Mac. Change-Id: I7f39bb2013db88e59f604e4491344d0d342e5f0b
* | am 97bcf915: Merge "Remove HAVE_PRINTF_ZD."Elliott Hughes2015-04-037-35/+0
|\ \ | |/ | | | | | | * commit '97bcf915ad005a4baeb981ed8da09ab219973b1f': Remove HAVE_PRINTF_ZD.
| * Remove HAVE_PRINTF_ZD.Elliott Hughes2015-04-037-35/+0
| | | | | | | | Change-Id: Ie7677e4816ad886c13a8ac869e7c7342082a350f
* | am dbaee628: Merge "Remove HAVE_STRLCPY."Elliott Hughes2015-04-036-35/+0
|\ \ | |/ | | | | | | * commit 'dbaee628ec6a8215b59db66dac86846e6481263a': Remove HAVE_STRLCPY.
| * Merge "Remove HAVE_STRLCPY."Elliott Hughes2015-04-036-35/+0
| |\
| | * Remove HAVE_STRLCPY.Elliott Hughes2015-04-026-35/+0
| | | | | | | | | | | | Change-Id: I27864a9075183de5bd83569d53a00fc2f53c96df
* | | am 555b7770: Merge "Move the inclusion of depfile to where it\'s generated."Ying Wang2015-04-031-5/+5
|\ \ \ | |/ / | | | | | | | | | * commit '555b7770fef6024ac6fe4e580f8a8d1663ceb001': Move the inclusion of depfile to where it's generated.
| * | Merge "Move the inclusion of depfile to where it's generated."Ying Wang2015-04-031-5/+5
| |\ \
| | * | Move the inclusion of depfile to where it's generated.Ying Wang2015-04-031-5/+5
| | | | | | | | | | | | | | | | Change-Id: Ib7ed6d7d9105e49961ac467fd1d390060d4f5c38
* | | | am 58912c87: Merge "Don\'t fail build of otatools if there are no device ↵Ying Wang2015-04-031-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | certificates" * commit '58912c874bff05e3e76ccc7b7907f628ed010bf5': Don't fail build of otatools if there are no device certificates
| * | | Merge "Don't fail build of otatools if there are no device certificates"Ying Wang2015-04-031-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Don't fail build of otatools if there are no device certificatesClaes Elgemark2015-04-021-1/+1
| | | | | | | | | | | | | | | | Change-Id: I32723701d952ef2243ce0234132fa9876f0f21b6
* | | | am 62003acd: Merge "Use PRIVATE_ALL_OBJECTS"Ying Wang2015-04-031-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '62003acdcc2ecdc13ce2a9880c35147d2070e865': Use PRIVATE_ALL_OBJECTS
| * | | Merge "Use PRIVATE_ALL_OBJECTS"Ying Wang2015-04-031-2/+2
| |\ \ \
| | * | | Use PRIVATE_ALL_OBJECTSYing Wang2015-04-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of the dirty $(filter) call. Change-Id: Idd3c9be570a00dc365a08e5b4ba1cb2e1f0ce005
* | | | | am ced6159b: Merge "Filter out gcc flags that are not recognized by clang."Chih-Hung Hsieh2015-04-021-2/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'ced6159b7e5551fcd3f64c21b7807c7555f80f73': Filter out gcc flags that are not recognized by clang.
| * | | | Filter out gcc flags that are not recognized by clang.Chih-Hung Hsieh2015-04-021-2/+6
| |/ / / | | | | | | | | | | | | Change-Id: I04e95fc3b0cb2825bf90a55916f89d25fa9fc475
* | | | am 71d4c95f: Merge "Fix typo."Ying Wang2015-04-021-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '71d4c95f83018199b8e79d0800dd2eca80b9f728': Fix typo.
| * | | Merge "Fix typo."Ying Wang2015-04-021-1/+1
| |\ \ \
| | * | | Fix typo.Ying Wang2015-04-021-1/+1
| | |/ / | | | | | | | | | | | | Change-Id: Ic934ed8610a4f03fbfb3d06dff4d911734a9d818
* | | | am 0064c51e: Merge "Use prebuilt libclang_rt.profile."Dan Albert2015-04-0216-19/+40
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '0064c51efee452daae110eac99b1321c00652c17': Use prebuilt libclang_rt.profile.
| * | | Use prebuilt libclang_rt.profile.Dan Albert2015-04-0116-19/+40
| |/ / | | | | | | | | | | | | Bug: 17574078 Change-Id: I4838cd5d125a0b2bf76aad2fdaef1ee3122687e8
* | | am 9a98c47c: Merge "Don\'t warn on definition of possibly reserved identifiers."Stephen Hines2015-04-011-0/+5
|\ \ \ | |/ / | | | | | | | | | * commit '9a98c47c64446e0c46f1d24f3d6526d177b62e14': Don't warn on definition of possibly reserved identifiers.
| * | Merge "Don't warn on definition of possibly reserved identifiers."Stephen Hines2015-04-011-0/+5
| |\ \
| | * | Don't warn on definition of possibly reserved identifiers.Stephen Hines2015-03-251-0/+5
| | | | | | | | | | | | | | | | Change-Id: Icfcfa94aac0503c97dee0ff4d0cd49107201526d
* | | | am 2ff6a3bb: Merge "Add explicit dependency on tzdata_updates_intermediates ↵Neil Fuller2015-04-011-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | for CTS" * commit '2ff6a3bbdf3a086e5e9a89e9acc66e8c5ae00539': Add explicit dependency on tzdata_updates_intermediates for CTS
| * | | Merge "Add explicit dependency on tzdata_updates_intermediates for CTS"Neil Fuller2015-04-011-1/+1
| |\ \ \
| | * | | Add explicit dependency on tzdata_updates_intermediates for CTSNeil Fuller2015-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The build was working on AOSP, but fails downstream when using Jack because the javalib.jar file needed by CTS is not being built by default there. Change-Id: I8dd836b33a4e1bae5af623db3822de99e9b05cf0
* | | | | am 53602955: Merge "Add support to sign bootable images with vboot_signer"Tao Bao2015-04-011-1/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '536029551d31d8084c444063349291781ee43ae1': Add support to sign bootable images with vboot_signer
| * | | | Merge "Add support to sign bootable images with vboot_signer"Tao Bao2015-04-011-1/+9
| |\ \ \ \
| | * | | | Add support to sign bootable images with vboot_signerTao Bao2015-04-011-1/+9
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add vboot properties to the dictionary file, which will be packed into the target_files zip. Add support in packaging and OTA scripts to sign the generated bootable images (boot.img and recovery.img) when vboot is enabled. Change-Id: I08758ced03d173219415bca762bbdb66c464a9f5 (cherry picked from commit 5d5a3bd9e8d8b14b71d1b2105417a2958d13d3d2)
* | | | | am b8765797: Merge "Add unwinder linking to STL setup."Dan Albert2015-04-011-0/+12
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'b8765797a89eebc97e38afcb94a965d69a8663ef': Add unwinder linking to STL setup.
| * | | | Add unwinder linking to STL setup.Dan Albert2015-03-311-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we were bundling this into libc++ and having each binary resolve its symbols from there. This means that the unwinder that gets used for a given binary is sensitive to the order in which its libraries are linked. Making this a static library dependency of each binary means the right unwinder will always be used. Bug: 18471342 Bug: 19958712 Change-Id: I782d212784dbf85355b5d9146d7460d675259a0e
* | | | | am 60335c03: Merge "Revert "Revert "Fix the libgcc/libatomic link order."""Dan Albert2015-04-011-8/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '60335c03d7e897267eb20e0b0a6c7c864fd08b43': Revert "Revert "Fix the libgcc/libatomic link order.""
| * | | | Revert "Revert "Fix the libgcc/libatomic link order.""Dan Albert2015-03-311-8/+6
| |/ / / | | | | | | | | | | | | This reverts commit e440c3c07b26258139156075f0a51a9ad92eef75.
* | | | am 3cc6a0f2: Merge "Addition of a CTS suite for tzdata update code"Neil Fuller2015-03-311-1/+15
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '3cc6a0f22f285c3fd8fb7f0b6559dd24b43e6541': Addition of a CTS suite for tzdata update code
| * | | Merge "Addition of a CTS suite for tzdata update code"Neil Fuller2015-03-311-1/+15
| |\ \ \ | | |_|/ | |/| |
| | * | Addition of a CTS suite for tzdata update codeNeil Fuller2015-03-261-1/+15
| | | | | | | | | | | | | | | | | | | | Bug: 19941636 Change-Id: Id0985f8c5be2f12858ee8bf52acf52bdb2df8741
* | | | am d63c78e0: Merge "Allow -mcpu=cortex-a15 for clang"Chih-hung Hsieh2015-03-271-2/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'd63c78e058da1418db133f62df4ace6f8109965b': Allow -mcpu=cortex-a15 for clang
| * | | Merge "Allow -mcpu=cortex-a15 for clang"Chih-hung Hsieh2015-03-271-2/+1
| |\ \ \
| | * | | Allow -mcpu=cortex-a15 for clangBernhard Rosenkränzer2015-03-251-2/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang 3.6 (including the snapshot present in AOSP) added support for -mcpu=cortex-a15 -- there's no need to fall back to generic armv7-a anymore. Change-Id: I8a582261ac35e32f8f1def1d244cf83f2096520d Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | am 8ffec13d: Merge "Add back Java resources to apk without Java code."Ying Wang2015-03-272-2/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '8ffec13d9b3ea46a5aea1837c1184e67a908f1ef': Add back Java resources to apk without Java code.
| * | | Add back Java resources to apk without Java code.Ying Wang2015-03-272-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With commit 33360dd56925276e4526f5f52c26423e2bb1a670 we moved Java resource packaging forward to creation of the jar file. But the Java resource packaging will be skipped if a module has no Java code at all. (The build system does support building an apk without Java code.) In this change we add back the Java resources directly to the built apk when the apk has no Java code. (cherry-picked from commit 8b27d1879c5692ebe6c5ac85383981fd96dfe2e1) Bug: 19947218 Change-Id: I0e1a65a9cbe656974f8ef3923b2f15e9efa5feb9
* | | | am 1b23b33d: Merge "MKBOOTIMG override were missing in two places"Ying Wang2015-03-271-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '1b23b33d92f32626584153739308e9147d1541bd': MKBOOTIMG override were missing in two places
| * | | Merge "MKBOOTIMG override were missing in two places"Ying Wang2015-03-271-2/+2
| |\ \ \
| | * | | MKBOOTIMG override were missing in two placesPer Astrand2015-03-251-2/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change follows the patten found in "Package OTA" and other places to allow for overriding the mkbootimg command. Now pass MKBOOTIMG variable to get make_recovery_patch and add_image_to_target to use the tool set in BOARD_CUSTOM_MKBOOTIMG for boot/recovery image generation. Change-Id: I78533c25e87c2750eb24ac1bf39e4b7ca321a441
* | | | am d5415dc7: Merge "Fix: exit code is 0 even when check-boot-jars.py fails"Ying Wang2015-03-261-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'd5415dc778abffdf7a9abba52b093da7a20496be': Fix: exit code is 0 even when check-boot-jars.py fails
| * | | Merge "Fix: exit code is 0 even when check-boot-jars.py fails"Ying Wang2015-03-261-3/+3
| |\ \ \
| | * | | Fix: exit code is 0 even when check-boot-jars.py failsJiyong Park2015-03-261-3/+3
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Fix the bug that build is still success when boot jars contain non-whitelisted classes. Now, check-boot-jars.py correctly finishes with exit code 1 when non-whitelisted classes are found. Change-Id: Id5c80ef9fdb70213d878d569f6033be2c9eb90d3