| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | | | am 0239220a: am 2f5de9f5: Merge "Bring main.mk in sync with master." | Narayan Kamath | 2014-04-02 | 1 | -1/+5 |
| |\ \ \
| | |/ / |
|
| | * | | Bring main.mk in sync with master. | Narayan Kamath | 2014-04-01 | 1 | -1/+5 |
* | | | | resolved conflicts for merge of f966bda4 to master | Ying Wang | 2014-03-31 | 1 | -4/+4 |
|\ \ \ \
| |/ / / |
|
| * | | | am 4714d3d7: am b34af41e: Merge "Fix java version detection when _JAVA_OPTION... | Ying Wang | 2014-04-01 | 1 | -6/+6 |
| |\ \ \
| | |/ / |
|
| | * | | Fix java version detection when _JAVA_OPTIONS is set. | Peter Ammon | 2014-03-31 | 1 | -6/+6 |
* | | | | Merge "Add warning message for java6 builds." | Narayan Kamath | 2014-03-21 | 1 | -1/+12 |
|\ \ \ \ |
|
| * | | | | Add warning message for java6 builds. | Narayan Kamath | 2014-03-20 | 1 | -1/+12 |
* | | | | | am 84fbc7e8: am 996f3826: am c5a56344: am 1c43aaea: Merge "Remove the redunda... | Ying Wang | 2014-03-20 | 1 | -1/+1 |
|\ \ \ \ \
| |/ / / /
|/| / / /
| |/ / / |
|
| * | | | am c5a56344: am 1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT" | Ying Wang | 2014-03-20 | 1 | -1/+1 |
| |\ \ \
| | |/ / |
|
| | * | | Remove the redundant DISABLE_DEXPREOPT | Ying Wang | 2014-03-20 | 1 | -1/+1 |
* | | | | am 332bbced: am a8d273d3: am bbe5f88e: Merge "Conditionally include the \'sam... | Ying Wang | 2014-02-26 | 1 | -0/+2 |
|\ \ \ \
| |/ / / |
|
| * | | | am bbe5f88e: Merge "Conditionally include the \'samplecode\' rules." | Ying Wang | 2014-02-26 | 1 | -0/+2 |
| |\ \ \
| | |/ / |
|
| | * | | Conditionally include the 'samplecode' rules. | Ying Wang | 2014-02-26 | 1 | -0/+2 |
* | | | | add exception to be able to build emulator_tests in conjunction with the | Tsu Chiang Chuang | 2014-02-25 | 1 | -1/+1 |
* | | | | am 52cefc36: resolved conflicts for merge of 6ca56b6a to klp-modular-dev-plus... | Ying Wang | 2014-02-18 | 1 | -1/+1 |
|\ \ \ \
| |/ / / |
|
| * | | | resolved conflicts for merge of 6ca56b6a to klp-modular-dev-plus-aosp | Ying Wang | 2014-02-18 | 1 | -1/+1 |
| |\ \ \
| | |/ /
| |/| /
| | |/ |
|
| | * | Make the module existence check nonfatal | Ying Wang | 2014-02-14 | 1 | -1/+5 |
* | | | am 1e8fec5b: am e2f06adb: Merge "Don\'t check the existence for the 64-bit mo... | Ying Wang | 2014-02-14 | 1 | -0/+4 |
|\ \ \
| |/ / |
|
| * | | Don't check the existence for the 64-bit modules for 32-bit SDK build. | Ying Wang | 2014-02-13 | 1 | -0/+4 |
* | | | am 2c32144b: resolved conflicts for merge of 7cd7bd65 to klp-modular-dev-plus... | Colin Cross | 2014-02-12 | 1 | -0/+2 |
|\ \ \
| |/ / |
|
| * | | HACK: add 64-bit directory blacklist | Colin Cross | 2014-02-12 | 1 | -0/+2 |
* | | | resolved conflicts for merge of b6d53f0b to master | Ying Wang | 2014-02-12 | 1 | -1/+5 |
|\ \ \
| |/ / |
|
| * | | Merge "Clean up dangling module names" | Ying Wang | 2014-02-12 | 1 | -1/+5 |
| |\ \ |
|
| | * | | Clean up dangling module names | Ying Wang | 2014-02-11 | 1 | -1/+5 |
* | | | | am 1968f286: am b12cce10: Merge "Refine module name resolving in multilib build" | Ying Wang | 2014-02-12 | 1 | -1/+56 |
|\ \ \ \
| |/ / / |
|
| * | | | Refine module name resolving in multilib build | Ying Wang | 2014-02-10 | 1 | -1/+56 |
| |/ / |
|
| * | | Dedup the targets and dependencies of required modules. | Ying Wang | 2014-01-31 | 1 | -0/+2 |
| |/ |
|
| * | Set up rules to build shared libraries for TARGET_2ND_ARCH | Ying Wang | 2014-01-24 | 1 | -0/+8 |
| * | Add missing paren in "java -version" check | Brian Carlstrom | 2014-01-20 | 1 | -1/+1 |
* | | Dedup the targets and dependencies of required modules. | Ying Wang | 2014-01-31 | 1 | -0/+2 |
* | | Set up rules to build shared libraries for TARGET_2ND_ARCH | Ying Wang | 2014-01-16 | 1 | -0/+8 |
* | | resolved conflicts for merge of 6835cbf9 to master | Narayan Kamath | 2013-12-06 | 1 | -9/+20 |
|\ \
| |/ |
|
| * | A few more Java7 related clean ups. | Narayan Kamath | 2013-12-05 | 1 | -16/+26 |
* | | am 71e5dd30: am 7a772619: Merge "core: support make 4.00" | Ying Wang | 2013-12-02 | 1 | -4/+2 |
|\ \
| |/ |
|
| * | Merge "core: support make 4.00" | Ying Wang | 2013-12-02 | 1 | -4/+2 |
| |\ |
|
| | * | core: support make 4.00 | synergydev | 2013-10-17 | 1 | -4/+2 |
| * | | Add experimental flag to support OpenJDK builds. | Ying Wang | 2013-11-26 | 1 | -7/+30 |
| * | | Merge commit 'c73341006286c391ae4d268a77f5e008045d5308' into HEAD | The Android Open Source Project | 2013-11-22 | 1 | -34/+44 |
| |\ \ |
|
* | | | | Call "java[c] -version" only once | Ying Wang | 2013-11-13 | 1 | -9/+13 |
* | | | | am 36e681b0: resolved conflicts for merge of 12f87a5b to klp-dev-plus-aosp | Elliott Hughes | 2013-11-07 | 1 | -2/+0 |
|\ \ \ \ |
|
| * \ \ \ | resolved conflicts for merge of 12f87a5b to klp-dev-plus-aosp | Elliott Hughes | 2013-11-07 | 1 | -2/+0 |
| |\ \ \ \
| | |/ / /
| | | / /
| | |/ /
| |/| | |
|
| | * | | am a05365ce: Merge "Remove the hacks needed to support ash and mksh concurren... | Elliott Hughes | 2013-11-07 | 1 | -2/+0 |
| | |\ \ |
|
| | | * | | Remove the hacks needed to support ash and mksh concurrently. | Elliott Hughes | 2013-11-05 | 1 | -2/+0 |
| | | |/ |
|
| | | * | Remove unnecessary dependencies between host and target modules. | Ying Wang | 2013-09-18 | 1 | -1/+11 |
* | | | | Add experimental flag to support OpenJDK builds. | Ying Wang | 2013-10-28 | 1 | -7/+30 |
* | | | | "make dist" should not try to package apps for embedded builds | Mike Lockwood | 2013-10-02 | 1 | -0/+2 |
|/ / / |
|
* | | | Load the ONE_SHOT_MAKEFILE even in dont_bother mode | Ying Wang | 2013-09-09 | 1 | -4/+3 |
* | | | Delete dead code. | Ying Wang | 2013-09-09 | 1 | -10/+0 |
* | | | In apps_only build dist a module only if it has a BUILT file. | Ying Wang | 2013-08-27 | 1 | -1/+1 |
* | | | Collect NOTICE files for apps_only build. | Ying Wang | 2013-08-24 | 1 | -0/+9 |