summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | am 39961b92: Merge "Remove another unused definition."Elliott Hughes2014-11-181-5/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '39961b926e637fd29cc6a32d956553c59c65e37c': Remove another unused definition.
| * | | | | | | | Merge "Remove another unused definition."Elliott Hughes2014-11-181-5/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove another unused definition.Elliott Hughes2014-11-181-5/+0
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have a lot of definitions around the tree, of which this is but one, but we have no users. Change-Id: Ic411505a0370be2b56150275fa9b8f5329241ce8
* | | | | | | | | am 3c0682c6: Merge "Kill unused ARCH_* defines."Elliott Hughes2014-11-183-15/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3c0682c6b52f30301a909a6f8376384a8547d376': Kill unused ARCH_* defines.
| * | | | | | | | Merge "Kill unused ARCH_* defines."Elliott Hughes2014-11-183-15/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Kill unused ARCH_* defines.Elliott Hughes2014-11-183-15/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No one's using ARCH_AARCH64 or AARCH_MIPS64 yet, and ARCH_PPC was always more aspirational than real. Change-Id: I07c6cbad6eb0917c4c24848a98c3bc9a3fe72db6
* | | | | | | | | am e5743ef7: Merge "Remove libdvm dex preopt support."Elliott Hughes2014-11-182-91/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e5743ef73f3a1911f6e2124e9ec3a6d671f6e378': Remove libdvm dex preopt support.
| * | | | | | | | Merge "Remove libdvm dex preopt support."Elliott Hughes2014-11-182-91/+0
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Remove libdvm dex preopt support.Elliott Hughes2014-11-172-91/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libdvm is dead. Change-Id: Ib8571c007f8a9f0e0eaf5c61b5d2e416b2d95089
* | | | | | | | | am ff62239b: am 2e216835: am 9220b6e6: am 0dd70276: am 6bdcb981: followup to ↵smain@google.com2014-11-181-18/+7
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recent cookie max-age change to remove parameter and use 2-year for all cookies bug: 17781603 * commit 'ff62239b026fb2635ffc6bdd3f0ad79d0fab2ee7': followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug: 17781603
| * | | | | | | | am 2e216835: am 9220b6e6: am 0dd70276: am 6bdcb981: followup to recent ↵smain@google.com2014-11-181-18/+7
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cookie max-age change to remove parameter and use 2-year for all cookies bug: 17781603 * commit '2e216835ee6d35e1c7b692f9982c1bd34b8ce703': followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug: 17781603
| | * | | | | | | am 9220b6e6: am 0dd70276: am 6bdcb981: followup to recent cookie max-age ↵smain@google.com2014-11-181-18/+7
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change to remove parameter and use 2-year for all cookies bug: 17781603 * commit '9220b6e676aefe152540a6cf832e5fd18817370e': followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug: 17781603
| | | * | | | | | am 0dd70276: am 6bdcb981: followup to recent cookie max-age change to remove ↵smain@google.com2014-11-181-18/+7
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parameter and use 2-year for all cookies bug: 17781603 * commit '0dd70276f6cfe09010054897a80d406ea9ac13de': followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug: 17781603
| | | | * | | | | am 6bdcb981: followup to recent cookie max-age change to remove parameter ↵smain@google.com2014-11-181-18/+7
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and use 2-year for all cookies bug: 17781603 * commit '6bdcb981ce098cae2fb9e690485ebaab47b2225a': followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug: 17781603
| | | | | * | | | | followup to recent cookie max-age change to remove parameter and use 2-year ↵smain@google.com2014-11-141-18/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for all cookies bug: 17781603 Change-Id: Id0da9d41e01c6a45672d1362fc1c5aa39e558904
* | | | | | | | | | am 57ed1ddf: Merge "kill HAVE_TERMIO_H"Yabin Cui2014-11-188-42/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '57ed1ddf78ecf7815a1b57137ea42893237a4756': kill HAVE_TERMIO_H
| * | | | | | | | | Merge "kill HAVE_TERMIO_H"Yabin Cui2014-11-188-42/+0
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | kill HAVE_TERMIO_HYabin Cui2014-11-178-42/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18398307 Change-Id: I54fc0235fbc40630f8024570b928dba115b1c39a
* | | | | | | | | | | am 8de0a3d3: am 139f8a81: am a4cf5cc9: (-s ours) am 5e923c91: Increment ↵Dave Langemak2014-11-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android versions to 5.0.1 * commit '8de0a3d31a3e0a5573fa99780df5ad7c272183f2': Increment Android versions to 5.0.1
| * | | | | | | | | | am 139f8a81: am a4cf5cc9: (-s ours) am 5e923c91: Increment Android versions ↵Dave Langemak2014-11-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to 5.0.1 * commit '139f8a8146f5b6d6c9da6dc744b3420d417bf3a5': Increment Android versions to 5.0.1
| | * | | | | | | | | am a4cf5cc9: (-s ours) am 5e923c91: Increment Android versions to 5.0.1Dave Langemak2014-11-180-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | / / | | | |_|_|_|_|_|/ / | | |/| | | | | | | * commit 'a4cf5cc9ecc3c5d2658943117f7d182b26c77b30': Increment Android versions to 5.0.1
| | | * | | | | | | am 5e923c91: Increment Android versions to 5.0.1Dave Langemak2014-11-182-1/+4
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '5e923c91b42f1df7ec3da97b1506dd9aa93795d0': Increment Android versions to 5.0.1
| | | | * | | | | | Increment Android versions to 5.0.1Dave Langemak2014-11-172-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2880123f0d1215f2028e6d3bc3f88fee5714ae74
* | | | | | | | | | am 9b0ccb74: Merge "Fix the libgcc/libatomic link order."Dan Albert2014-11-182-19/+7
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9b0ccb7480a0b86d27bb6c7352b5cd5e79bfbf82': Fix the libgcc/libatomic link order.
| * | | | | | | | | Merge "Fix the libgcc/libatomic link order."Dan Albert2014-11-172-19/+7
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix the libgcc/libatomic link order.Dan Albert2014-11-132-19/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous position of libgcc.a/libatomic.a on the link line causes the linker to prefer satisfying dependencies from these libraries from other libraries that might include them, rather than from libgcc.a (or libatomic.a) itself. This imposes an ABI requirement that those intermediate shared libraries _always_ export those symbols, which is undesirable. Change-Id: Ib593236b475d3e98356b2b1be6f96cee2b67378f
* | | | | | | | | | | am 654e3907: Merge "Remove libstlport from PRODUCT_PACKAGES."Dan Albert2014-11-171-1/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '654e39072ecfc0052af0cbfca7e51aa8fc7856e8': Remove libstlport from PRODUCT_PACKAGES.
| * | | | | | | | | | Merge "Remove libstlport from PRODUCT_PACKAGES."Dan Albert2014-11-171-1/+0
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Remove libstlport from PRODUCT_PACKAGES.Dan Albert2014-11-171-1/+0
| | | |_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15193147 Change-Id: Idd2699d895393216bcd514da64145540faec4033
* | | | | | | | | | | am ec64b05e: Merge "Add -Wl,--hash-style=sysv flag to rs: transform-bc-to-so ↵Miao Wang2014-11-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for compatibility lib." * commit 'ec64b05e9db4c9898d1a6652e58741597261e46a': Add -Wl,--hash-style=sysv flag to rs: transform-bc-to-so for compatibility lib.
| * | | | | | | | | | Merge "Add -Wl,--hash-style=sysv flag to rs: transform-bc-to-so for ↵Miao Wang2014-11-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compatibility lib."
| | * | | | | | | | | | Add -Wl,--hash-style=sysv flag to rs: transform-bc-to-so for compatibility lib.Miao Wang2014-11-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 18395015 Change-Id: Ib9aecf347c685c8b8b725eecfbc0cec03d9b2c1b
* | | | | | | | | | | | am f63ca1e9: Merge "Disable gnu style linker hash for NDK builds."Dan Albert2014-11-171-40/+46
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f63ca1e9ea392d6aea7e2cfd6239d904e6ae017d': Disable gnu style linker hash for NDK builds.
| * | | | | | | | | | | Merge "Disable gnu style linker hash for NDK builds."Dan Albert2014-11-171-40/+46
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Disable gnu style linker hash for NDK builds.Dan Albert2014-11-151-40/+46
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This feature is now available in AOSP, but not for any shipped release. We don't have an API version for the release that this will be available in yet, so for now the check is commented out. Bug: 18395015 Change-Id: I247233d047ed5a7564d6602d47c9ad962313c8dc
* | | | | | | | | | | am d72ba828: am 1b879e3c: Fix PDK build.Ying Wang2014-11-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd72ba8280a383d2653714b2e382a51e23d33d55a': Fix PDK build.
| * | | | | | | | | | am 1b879e3c: Fix PDK build.Ying Wang2014-11-171-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1b879e3c2617dcd9d31a34d1d3c4e7790f9a41e0': Fix PDK build.
| | * | | | | | | | | Fix PDK build.Ying Wang2014-11-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add frameworks/base/preloaded-classes to PRODUCT_COPY_FILES only if it exists in the source tree. Bug: 18305157 Change-Id: I46c277ebfb8095f9e5fe0fbb21276d932509f2eb
* | | | | | | | | | | am 45f975bb: Merge "Fix PDK build."Ying Wang2014-11-171-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '45f975bba5efca94fae9471ce4388a51bd919b5d': Fix PDK build.
| * | | | | | | | | | Merge "Fix PDK build."Ying Wang2014-11-171-2/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix PDK build.Ying Wang2014-11-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add frameworks/base/preloaded-classes to PRODUCT_COPY_FILES only if it exists in the source tree. Bug: 18305157 Change-Id: I46c277ebfb8095f9e5fe0fbb21276d932509f2eb
* | | | | | | | | | | | am 5cef1ce3: Merge "Install preloaded-classes as a standalone configuration ↵Ying Wang2014-11-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | file" * commit '5cef1ce30d65edb21c5d352c5618186b95273e5c': Install preloaded-classes as a standalone configuration file
| * | | | | | | | | | | Merge "Install preloaded-classes as a standalone configuration file"Ying Wang2014-11-172-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Install preloaded-classes as a standalone configuration fileYing Wang2014-11-172-1/+7
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Install preloaded-classes as a standalone configuration file /system/etc/preloaded-classes, so we can configure different file per product. To override the default frameworks/base/preloaded-classes, just override in your product configuration makefile with PRODUCT_COPY_FILES before it inherits from build/target/product/base.mk: if there are multiple items in PRODUCT_COPY_FILES with the same destination, the first one takes precedence. Bug: 18305157 Change-Id: I937632b4a1aa73310ec90e73fd708fbd0c704a21
* | | | | | | | | | | am fbb553dc: Merge "Colorize build success/failure message."Dan Albert2014-11-171-5/+13
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fbb553dcd8a1cc65a7b2f56fca7604d5850f59c8': Colorize build success/failure message.
| * | | | | | | | | | Merge "Colorize build success/failure message."Dan Albert2014-11-171-5/+13
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Colorize build success/failure message.Dan Albert2014-11-141-5/+13
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8901689876e65f5b72050c40e1580f167e49c2b0
* | | | | | | | | | am 9a0a8bd0: am 9a9d180f: Install preloaded-classes as a standalone ↵Ying Wang2014-11-172-1/+7
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configuration file * commit '9a0a8bd00697fd6dd3e7dd6fb5dcf3697dc27507': Install preloaded-classes as a standalone configuration file
| * | | | | | | | | am 9a9d180f: Install preloaded-classes as a standalone configuration fileYing Wang2014-11-172-1/+7
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9a9d180ff1cafc547bd9d3b31a10db749d8ab359': Install preloaded-classes as a standalone configuration file
| | * | | | | | | | Install preloaded-classes as a standalone configuration fileYing Wang2014-11-142-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Install preloaded-classes as a standalone configuration file /system/etc/preloaded-classes, so we can configure different file per product. To override the default frameworks/base/preloaded-classes, just override in your product configuration makefile with PRODUCT_COPY_FILES before it inherits from build/target/product/base.mk: if there are multiple items in PRODUCT_COPY_FILES with the same destination, the first one takes precedence. Bug: 18305157 Change-Id: I937632b4a1aa73310ec90e73fd708fbd0c704a21