summaryrefslogtreecommitdiffstats
path: root/core/main.mk
Commit message (Expand)AuthorAgeFilesLines
* am 6e40faa2: am 44984951: am 162e1906: am b271669a: Merge "Fix a trivial comm...Elliott Hughes2015-04-251-1/+1
|\
| * Fix a trivial comment typo.Elliott Hughes2015-04-251-1/+1
* | am 783a632f: am 7f914204: am 55fbc49f: Merge "Change eng builds from interpre...Mathieu Chartier2015-03-231-4/+4
|\ \ | |/
| * Change eng builds from interpret-only to verify-at-runtimeMathieu Chartier2015-03-201-4/+4
* | am b01a4ca3: am 68f6e305: am 9682e56a: Merge "Revert "Rename dalvik.vm.usejit...Mathieu Chartier2015-03-191-1/+1
|\ \ | |/
| * Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"Mathieu Chartier2015-03-181-1/+1
* | am 7b93109e: am d7f3d8ba: am 8ca542f4: Merge "Rename dalvik.vm.usejit to debu...Mathieu Chartier2015-03-171-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
* | JIT default opt-inMathieu Chartier2015-03-121-0/+1
* | Load cts/build/config.mk after build/core/config.mkYing Wang2015-02-131-0/+3
* | am 16ba2ed8: resolved conflicts for merge of 4c178ebc to lmp-mr1-dev-plus-aospYing Wang2015-02-041-8/+0
|\ \ | |/
| * 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
* | | am 10500d0e: resolved conflicts for merge of 5cb4276e to lmp-mr1-dev-plus-aospYing Wang2015-01-311-1/+2
|\ \ \ | |/ /
| * | 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
* | | resolved conflicts for merge of 0f205ad9 to masterYing Wang2015-01-221-2/+2
|\ \ \ | |/ /
| * | am 9f9ccbfd: Merge "Fix missing parenthesis."Christopher Ferris2015-01-221-2/+2
| |\ \ | | |/
| | * Fix missing parenthesis.Christopher Ferris2015-01-201-2/+2
* | | Support to build AAR for static Java libraries.Ying Wang2014-12-181-1/+3
|/ /
* | 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