summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* DO NOT MERGE: Combine emulator test projects into a single apkSteve Moyer2014-06-041-0/+1
* DO NOT MERGE: Combine emulator test projects into a single apkSteve Moyer2014-06-041-2/+2
* Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler."Primiano Tucci2014-06-032-8/+22
|\
| * Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler.Primiano Tucci2014-06-022-8/+22
* | am 40b7e342: Merge "Move sdk staging dir to a product-specific dir"Ying Wang2014-06-031-1/+1
|\ \
| * \ Merge "Move sdk staging dir to a product-specific dir"Ying Wang2014-06-031-1/+1
| |\ \
| | * | Move sdk staging dir to a product-specific dirYing Wang2014-06-021-1/+1
| | |/
* | | am c706ea79: Merge "Include selinux_version file with builds."Nick Kralevich2014-06-021-1/+2
|\ \ \ | |/ /
| * | Merge "Include selinux_version file with builds."Nick Kralevich2014-06-021-1/+2
| |\ \ | | |/ | |/|
| | * Include selinux_version file with builds.Robert Craig2014-04-281-1/+2
* | | am a8b65126: Merge "Add -shared to clang LDFLAGS."Stephen Hines2014-05-304-0/+4
|\ \ \ | |/ /
| * | Merge "Add -shared to clang LDFLAGS."Stephen Hines2014-05-304-0/+4
| |\ \
| | * | Add -shared to clang LDFLAGS.Tim Murray2014-05-294-0/+4
* | | | am a42e0f50: Merge "arm64: restore relro/now"Nick Kralevich2014-05-301-2/+2
|\ \ \ \ | |/ / /
| * | | Merge "arm64: restore relro/now"Nick Kralevich2014-05-301-2/+2
| |\ \ \
| | * | | arm64: restore relro/nowNick Kralevich2014-05-301-2/+2
| |/ / /
* | | | am 61cf065a: Merge "Use a separate policy for the recovery image."Nick Kralevich2014-05-301-1/+4
|\ \ \ \ | |/ / /
| * | | Merge "Use a separate policy for the recovery image."Nick Kralevich2014-05-301-1/+4
| |\ \ \
| | * | | Use a separate policy for the recovery image.Stephen Smalley2014-05-291-1/+4
* | | | | am 5c2c70de: Merge "Add -latomic to all target builds"Andrew Hsieh2014-05-308-0/+34
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add -latomic to all target builds"Andrew Hsieh2014-05-308-0/+34
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Add -latomic to all target buildsAndrew Hsieh2014-05-298-0/+34
* | | | | am 2a2ba735: Merge "Add libsigchain to the embedded.mk makefile"Dave Allison2014-05-291-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add libsigchain to the embedded.mk makefile"Dave Allison2014-05-291-1/+2
| |\ \ \ \
| | * | | | Add libsigchain to the embedded.mk makefileDave Allison2014-05-161-1/+2
* | | | | | am e0df9d95: Merge "Only enable WITH_DEXPREOPT by default for libdvm.so"Brian Carlstrom2014-05-291-4/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Only enable WITH_DEXPREOPT by default for libdvm.so"Brian Carlstrom2014-05-291-4/+6
| |\ \ \ \ \
| | * | | | | Only enable WITH_DEXPREOPT by default for libdvm.soBrian Carlstrom2014-05-291-4/+6
* | | | | | | am f2a2406b: Merge "Remove dependencies on runtime_libdvm and libdvm.so in ge...Brian Carlstrom2014-05-292-1/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"Brian Carlstrom2014-05-292-1/+3
| |\ \ \ \ \ \ | | |/ / / / / | | | | / / / | | |_|/ / / | |/| | | |
| | * | | | Remove dependencies on runtime_libdvm and libdvm.so in generalBrian Carlstrom2014-05-292-1/+3
| |/ / / /
* | | | | am b3bed595: Merge "Add a dummy build recipe for generated RS cpp files."Ying Wang2014-05-282-2/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add a dummy build recipe for generated RS cpp files."Ying Wang2014-05-282-2/+4
| |\ \ \ \
| | * | | | Add a dummy build recipe for generated RS cpp files.Ying Wang2014-05-282-2/+4
* | | | | | am 65afd710: Merge "Add a dummy build recipe for the proto generated header f...Ying Wang2014-05-281-0/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Add a dummy build recipe for the proto generated header files"Ying Wang2014-05-281-0/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Add a dummy build recipe for the proto generated header filesYing Wang2014-05-281-0/+2
* | | | | | am 7df64f7c: Merge "Move to dalvik.vm.lib.2 to force default to libart"Brian Carlstrom2014-05-282-1/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Move to dalvik.vm.lib.2 to force default to libart"Brian Carlstrom2014-05-282-1/+4
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Move to dalvik.vm.lib.2 to force default to libartBrian Carlstrom2014-05-282-1/+4
| |/ / / /
* | | | | am f4999d3b: Merge "Fix pattern rules for for libdvm."Ying Wang2014-05-282-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix pattern rules for $(installed_odex) for libdvm."Ying Wang2014-05-282-3/+3
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix pattern rules for $(installed_odex) for libdvm.Ying Wang2014-05-282-3/+3
| |/ / /
* | | | am aae7e3fa: Merge "Support LOCAL_CLANG with arch/bit suffix."Ying Wang2014-05-282-11/+25
|\ \ \ \ | |/ / /
| * | | Merge "Support LOCAL_CLANG with arch/bit suffix."Ying Wang2014-05-282-11/+25
| |\ \ \
| | * | | Support LOCAL_CLANG with arch/bit suffix.Ying Wang2014-05-272-11/+25
* | | | | am 4afe808c: Merge "Fix all the system image sizes."Elliott Hughes2014-05-283-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix all the system image sizes."Elliott Hughes2014-05-283-3/+3
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix all the system image sizes.Elliott Hughes2014-05-273-3/+3
| |/ / /
* | | | am 3805f619: Merge "Revert "Fix for duplicate names in whole static libs""Dan Albert2014-05-272-21/+21
|\ \ \ \ | |/ / /