summaryrefslogtreecommitdiffstats
path: root/core/main.mk
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add warning message for java6 builds."Narayan Kamath2014-03-211-1/+12
|\
| * Add warning message for java6 builds.Narayan Kamath2014-03-201-1/+12
* | am 84fbc7e8: am 996f3826: am c5a56344: am 1c43aaea: Merge "Remove the redunda...Ying Wang2014-03-201-1/+1
|\ \ | |/ |/|
| * am c5a56344: am 1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"Ying Wang2014-03-201-1/+1
| |\
| | * Remove the redundant DISABLE_DEXPREOPTYing Wang2014-03-201-1/+1
* | | am 332bbced: am a8d273d3: am bbe5f88e: Merge "Conditionally include the \'sam...Ying Wang2014-02-261-0/+2
|\ \ \ | |/ /
| * | am bbe5f88e: Merge "Conditionally include the \'samplecode\' rules."Ying Wang2014-02-261-0/+2
| |\ \ | | |/
| | * Conditionally include the 'samplecode' rules.Ying Wang2014-02-261-0/+2
* | | add exception to be able to build emulator_tests in conjunction with theTsu Chiang Chuang2014-02-251-1/+1
* | | am 52cefc36: resolved conflicts for merge of 6ca56b6a to klp-modular-dev-plus...Ying Wang2014-02-181-1/+1
|\ \ \ | |/ /
| * | resolved conflicts for merge of 6ca56b6a to klp-modular-dev-plus-aospYing Wang2014-02-181-1/+1
| |\ \ | | |/ | |/|
| | * Make the module existence check nonfatalYing Wang2014-02-141-1/+5
* | | am 1e8fec5b: am e2f06adb: Merge "Don\'t check the existence for the 64-bit mo...Ying Wang2014-02-141-0/+4
|\ \ \ | |/ /
| * | Don't check the existence for the 64-bit modules for 32-bit SDK build.Ying Wang2014-02-131-0/+4
* | | am 2c32144b: resolved conflicts for merge of 7cd7bd65 to klp-modular-dev-plus...Colin Cross2014-02-121-0/+2
|\ \ \ | |/ /
| * | HACK: add 64-bit directory blacklistColin Cross2014-02-121-0/+2
* | | resolved conflicts for merge of b6d53f0b to masterYing Wang2014-02-121-1/+5
|\ \ \ | |/ /
| * | Merge "Clean up dangling module names"Ying Wang2014-02-121-1/+5
| |\ \
| | * | Clean up dangling module namesYing Wang2014-02-111-1/+5
* | | | am 1968f286: am b12cce10: Merge "Refine module name resolving in multilib build"Ying Wang2014-02-121-1/+56
|\ \ \ \ | |/ / /
| * | | Refine module name resolving in multilib buildYing Wang2014-02-101-1/+56
| |/ /
| * | Dedup the targets and dependencies of required modules.Ying Wang2014-01-311-0/+2
| |/
| * Set up rules to build shared libraries for TARGET_2ND_ARCHYing Wang2014-01-241-0/+8
| * Add missing paren in "java -version" checkBrian Carlstrom2014-01-201-1/+1
* | Dedup the targets and dependencies of required modules.Ying Wang2014-01-311-0/+2
* | Set up rules to build shared libraries for TARGET_2ND_ARCHYing Wang2014-01-161-0/+8
* | resolved conflicts for merge of 6835cbf9 to masterNarayan Kamath2013-12-061-9/+20
|\ \ | |/
| * A few more Java7 related clean ups.Narayan Kamath2013-12-051-16/+26
* | am 71e5dd30: am 7a772619: Merge "core: support make 4.00"Ying Wang2013-12-021-4/+2
|\ \ | |/
| * Merge "core: support make 4.00"Ying Wang2013-12-021-4/+2
| |\
| | * core: support make 4.00synergydev2013-10-171-4/+2
| * | Add experimental flag to support OpenJDK builds.Ying Wang2013-11-261-7/+30
| * | Merge commit 'c73341006286c391ae4d268a77f5e008045d5308' into HEADThe Android Open Source Project2013-11-221-34/+44
| |\ \
* | | | Call "java[c] -version" only onceYing Wang2013-11-131-9/+13
* | | | am 36e681b0: resolved conflicts for merge of 12f87a5b to klp-dev-plus-aospElliott Hughes2013-11-071-2/+0
|\ \ \ \
| * \ \ \ resolved conflicts for merge of 12f87a5b to klp-dev-plus-aospElliott Hughes2013-11-071-2/+0
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | am a05365ce: Merge "Remove the hacks needed to support ash and mksh concurren...Elliott Hughes2013-11-071-2/+0
| | |\ \
| | | * | Remove the hacks needed to support ash and mksh concurrently.Elliott Hughes2013-11-051-2/+0
| | | |/
| | | * Remove unnecessary dependencies between host and target modules.Ying Wang2013-09-181-1/+11
* | | | Add experimental flag to support OpenJDK builds.Ying Wang2013-10-281-7/+30
* | | | "make dist" should not try to package apps for embedded buildsMike Lockwood2013-10-021-0/+2
|/ / /
* | | Load the ONE_SHOT_MAKEFILE even in dont_bother modeYing Wang2013-09-091-4/+3
* | | Delete dead code.Ying Wang2013-09-091-10/+0
* | | In apps_only build dist a module only if it has a BUILT file.Ying Wang2013-08-271-1/+1
* | | Collect NOTICE files for apps_only build.Ying Wang2013-08-241-0/+9
* | | am b88ca53a: am ddce2eb0: am de32713f: Merge "Collect and store proguard obfu...Ying Wang2013-08-231-0/+3
|\ \ \
| * | | Collect and store proguard obfuscation dictionary files.Ying Wang2013-08-231-0/+3
* | | | am 2363485c: am 06de9f94: am 8709497e: Merge "Revert "Collect and store progu...Ying Wang2013-08-231-3/+0
|\ \ \ \ | |/ / /
| * | | Revert "Collect and store proguard obfuscation dictionary files."Ying Wang2013-08-231-3/+0
* | | | am 93b95dc4: am aa87a11d: am afd7457a: Merge "Collect and store proguard obfu...Ying Wang2013-08-231-0/+3
|\ \ \ \ | |/ / /