summaryrefslogtreecommitdiffstats
path: root/core/main.mk
Commit message (Expand)AuthorAgeFilesLines
* Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"Mathieu Chartier2015-03-181-1/+1
* Rename dalvik.vm.usejit to debug.dalvik.vm.usejitMathieu Chartier2015-03-161-1/+1
* Load cts/build/config.mk after build/core/config.mkYing Wang2015-03-161-0/+3
* JIT default opt-inMathieu Chartier2015-03-121-0/+1
* resolved conflicts for merge of 4c178ebc to lmp-mr1-dev-plus-aospYing Wang2015-02-041-8/+0
|\
| * Remove support of factory ramdisk/bundle.Ying Wang2015-02-041-8/+0
* | resolved conflicts for merge of 5cb4276e to lmp-mr1-dev-plus-aospYing Wang2015-01-301-1/+2
|\ \ | |/
| * Add target recoveryimage-nodeps.Ying Wang2015-01-301-1/+2
* | am 9f9ccbfd: Merge "Fix missing parenthesis."Christopher Ferris2015-01-221-2/+2
|\ \ | |/
| * Fix missing parenthesis.Christopher Ferris2015-01-201-2/+2
* | am 73a730ca: Merge "Remove libdvm support from the core build system."Ying Wang2014-12-161-6/+6
|\ \ | |/
| * Remove libdvm support from the core build system.Ying Wang2014-12-161-6/+6
* | am 93efec89: Merge "Pass instruction set variant to dex2oat."Ian Rogers2014-11-141-2/+11
|\ \ | |/
| * Pass instruction set variant to dex2oat.Ian Rogers2014-11-081-2/+11
* | am b78348d5: am 5968de73: Merge "Remove stale dexopt flags."Ian Rogers2014-11-061-10/+0
|\ \ | |/
| * am 5968de73: Merge "Remove stale dexopt flags."Ian Rogers2014-11-061-10/+0
| |\
| | * Remove stale dexopt flags.Ian Rogers2014-11-051-10/+0
* | | am acd65c7d: am 97ef1d46: Merge "Add OpenJDK 8 experimental support"Neil Fuller2014-10-291-1/+9
|\ \ \ | |/ /
| * | am 97ef1d46: Merge "Add OpenJDK 8 experimental support"Neil Fuller2014-10-281-1/+9
| |\ \ | | |/
| | * Add OpenJDK 8 experimental supportNeil Fuller2014-10-231-1/+9
* | | am f7ce9508: am 4dfda1fa: Merge "Remove Java 6 build support"Neil Fuller2014-10-291-12/+1
|\ \ \ | |/ /
| * | am 4dfda1fa: Merge "Remove Java 6 build support"Neil Fuller2014-10-241-12/+1
| |\ \ | | |/
| | * Remove Java 6 build supportNeil Fuller2014-10-221-12/+1
| * | am c776f063: Merge "Build: Do not set interpreted mode for SDK build" into lm...Andreas Gampe2014-10-031-4/+6
| |\ \
| * \ \ am 8c444b61: am b97b1e59: Merge "Enable dalvik.vm.lockprof.threshold on eng b...Brian Carlstrom2014-09-191-3/+2
| |\ \ \ | | | |/ | | |/|
* | | | Store symbols.zip in apps_only build. automerge: a60fb49Ying Wang2014-10-281-0/+3
|\ \ \ \
| * | | | Store symbols.zip in apps_only build.Ying Wang2014-10-271-0/+3
| | |_|/ | |/| |
* | | | am d8a89a88: am c776f063: Merge "Build: Do not set interpreted mode for SDK b...Andreas Gampe2014-10-041-4/+6
|\ \ \ \ | |/ / /
| * | | Build: Do not set interpreted mode for SDK buildAndreas Gampe2014-10-031-4/+6
* | | | am 8c444b61: am b97b1e59: Merge "Enable dalvik.vm.lockprof.threshold on eng b...Brian Carlstrom2014-09-191-3/+2
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebugBrian Carlstrom2014-09-191-3/+2
| * | Push ISA features into system propertiesCalin Juravle2014-08-261-0/+5
* | | am e8892aa4: Merge "Push ISA features into system properties" into lmp-devCalin Juravle2014-08-261-0/+5
|\ \ \ | | |/ | |/|
| * | Push ISA features into system propertiesCalin Juravle2014-08-261-0/+5
| * | Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]Brian Carlstrom2014-08-061-2/+2
* | | resolved conflicts for merge of 9b80095e to lmp-dev-plus-aospBrian Carlstrom2014-08-041-2/+2
|\ \ \ | | |/ | |/|
| * | Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]Brian Carlstrom2014-07-301-2/+2
| * | Don't fail the build for dangling module names.Ying Wang2014-07-301-1/+1
* | | resolved conflicts for merge of ef44fb2d to lmp-dev-plus-aospYing Wang2014-07-171-4/+0
|\ \ \ | |/ / | | / | |/ |/|
| * Remove linker64 and debuggerd64Ying Wang2014-07-171-4/+0
* | am daaec135: am 5899ad25: am b00bb2d8: Merge "Resolve :32 to 32-bit variant o...Ying Wang2014-06-241-1/+3
|\ \
| * \ am 5899ad25: am b00bb2d8: Merge "Resolve :32 to 32-bit variant only if the va...Ying Wang2014-06-241-1/+3
| |\ \ | | |/
| | * Resolve :32 to 32-bit variant only if the variant exists.Ying Wang2014-06-241-1/+3
* | | am a1ac4736: am b110da5f: am 9d8854e3: Merge "build: delete 64-bit blacklist"Colin Cross2014-06-181-2/+0
|\ \ \ | |/ /
| * | am b110da5f: am 9d8854e3: Merge "build: delete 64-bit blacklist"Colin Cross2014-06-181-2/+0
| |\ \ | | |/
| | * build: delete 64-bit blacklistColin Cross2014-06-171-2/+0
* | | am 2ebf7c1c: am 6b468193: am cc2a47bf: Merge "Check existence of both 64-bit ...Ying Wang2014-06-111-14/+7
|\ \ \ | |/ /
| * | am 6b468193: am cc2a47bf: Merge "Check existence of both 64-bit and 32-bit mo...Ying Wang2014-06-111-14/+7
| |\ \ | | |/
| | * Check existence of both 64-bit and 32-bit module variants.Ying Wang2014-06-101-14/+7
* | | am dceddd91: am 79b46720: am 02f98a26: Merge "Fix loophole in module expansion."Ying Wang2014-06-111-23/+37
|\ \ \ | |/ /