diff options
| author | David 'Digit' Turner <digit@google.com> | 2011-08-25 23:23:32 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2011-08-25 23:23:32 +0200 |
| commit | 6da54b6e0e0b9daba92562fbf4434887dc1e3528 (patch) | |
| tree | 636add847c10bdf041cebdd84b6a3462b07c4dc3 /core/main.mk | |
| parent | 2bcdfe145d485fc28e86700e4ed57ac67368de25 (diff) | |
| parent | 7be88d00bb26d163b1432ea9a04e07998c26133c (diff) | |
| download | build-6da54b6e0e0b9daba92562fbf4434887dc1e3528.zip build-6da54b6e0e0b9daba92562fbf4434887dc1e3528.tar.gz build-6da54b6e0e0b9daba92562fbf4434887dc1e3528.tar.bz2 | |
resolved conflicts for merge of 7be88d00 to honeycomb-plus-aosp
Change-Id: I2f1b26f737dcc521e5a81a660356468eca6d2717
Diffstat (limited to 'core/main.mk')
| -rw-r--r-- | core/main.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/main.mk b/core/main.mk index 6750baa..ddcb591 100644 --- a/core/main.mk +++ b/core/main.mk @@ -399,6 +399,7 @@ subdirs := \ development/host \ development/tools/etc1tool \ development/tools/line_endings \ + development/tools/emulator/opengl \ external/clang \ external/easymock \ external/expat \ |