summaryrefslogtreecommitdiffstats
path: root/core/main.mk
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ | |/ /
| * | am 79b46720: am 02f98a26: Merge "Fix loophole in module expansion."Ying Wang2014-06-101-23/+37
| |\ \ | | |/
| | * Fix loophole in module expansion.Ying Wang2014-06-101-23/+37
| * | am ab6f84e3: am e0df9d95: Merge "Only enable WITH_DEXPREOPT by default for li...Brian Carlstrom2014-05-291-4/+6
| |\ \ | | |/
| | * Only enable WITH_DEXPREOPT by default for libdvm.soBrian Carlstrom2014-05-291-4/+6
* | | am 9f8e214a: Only enable WITH_DEXPREOPT by default for libdvm.soBrian Carlstrom2014-05-291-4/+6
|\ \ \
| * | | Only enable WITH_DEXPREOPT by default for libdvm.soBrian Carlstrom2014-05-281-4/+6
* | | | am 2bf10a72: am cdcb6926: am 6cb69bd4: Merge "Add HOST_PREFER_32_BIT to suppo...Ying Wang2014-05-231-0/+8
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am cdcb6926: am 6cb69bd4: Merge "Add HOST_PREFER_32_BIT to support 32-bit-by-...Ying Wang2014-05-231-0/+8
| |\ \ | | |/
| | * Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib buildYing Wang2014-05-201-0/+8
* | | Don't build tests in PDK build.Ying Wang2014-05-211-0/+2
* | | check build tests modules in eng and userdebug buildsYing Wang2014-05-211-0/+4
* | | am e50f2d9f: am 40b49d30: am a74ade94: Merge "Support host multilib build"Ying Wang2014-05-151-8/+0
|\ \ \ | |/ /
| * | am 40b49d30: am a74ade94: Merge "Support host multilib build"Ying Wang2014-05-151-8/+0
| |\ \ | | |/
| | * Support host multilib buildYing Wang2014-05-141-8/+0
* | | am 873782cc: am 9e3259f5: am fb67f05d: Merge changes I53b2ada9,I30794ea5David 'Digit' Turner2014-05-111-15/+1
|\ \ \ | |/ /
| * | am 9e3259f5: am fb67f05d: Merge changes I53b2ada9,I30794ea5David 'Digit' Turner2014-05-111-15/+1
| |\ \ | | |/
| | * Disable emulator from platform builds.David 'Digit' Turner2014-05-091-15/+1
| * | am d6214b31: am 0d4b3df6: Merge "Target "tests" now only builds the modules t...Ying Wang2014-05-091-1/+2
| |\ \ | | |/
| | * Target "tests" now only builds the modules tagged as "tests"Ying Wang2014-05-081-1/+2
* | | Merge "Target "tests" now only builds the modules tagged as "tests""Ying Wang2014-05-081-1/+2
|\ \ \
| * | | Target "tests" now only builds the modules tagged as "tests"Ying Wang2014-05-081-1/+2
* | | | am 676c8f04: am 4ed19f0f: am 1e63c2d1: Merge "Add dalvik.vm.dex2oat-flags for...Brian Carlstrom2014-05-081-0/+4
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am 4ed19f0f: am 1e63c2d1: Merge "Add dalvik.vm.dex2oat-flags for eng build"Brian Carlstrom2014-05-081-0/+4
| |\ \ | | |/
| | * Add dalvik.vm.dex2oat-flags for eng buildBrian Carlstrom2014-05-061-0/+4
* | | resolved conflicts for merge of 70555a16 to masterYing Wang2014-04-151-1/+1
|\ \ \ | |/ /
| * | am fcd22c88: Merge "Allow to build target-files.zip in sdk build." into klp-m...Ying Wang2014-04-151-1/+1
| |\ \
| | * | Allow to build target-files.zip in sdk build.Ying Wang2014-04-141-1/+1
| * | | am 0df45b08: am 260942fa: Merge "Build with java7 by default."Ying Wang2014-04-051-51/+33
| |\ \ \ | | | |/ | | |/|
| | * | Build with java7 by default.Narayan Kamath2014-04-041-51/+33
* | | | Preserve symlinked OUT_DIR by only clearing contentsAlan Viverette2014-04-071-1/+1
* | | | Build with java7 by default.Narayan Kamath2014-04-041-43/+33
* | | | am 88e1a110: am 680e0370: am 59ff6009: Merge "Unset _JAVA_OPTIONS before runn...Ying Wang2014-04-031-6/+6
|\ \ \ \ | |/ / /