| commit | d44d54a0d947de3bda7132ed9216b9685ace92dd | [log] [tgz] |
|---|---|---|
| author | Raphael <raphael@google.com> | Wed Dec 21 15:02:38 2011 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Dec 21 15:02:38 2011 -0800 |
| tree | e0c740e5d157083500eb8ed4270aa7804f77d785 | |
| parent | 931a099a4c56a1efadbc341ed6f8740c15f1aa75 [diff] | |
| parent | 0ae6d2956858ed3a9c0b65fecd70bc783976173c [diff] |
Merge "Add 2 SDK directories that can build under Cygwin/Mingw"
diff --git a/core/main.mk b/core/main.mk index 3eafa31..939d9d7 100644 --- a/core/main.mk +++ b/core/main.mk
@@ -397,6 +397,7 @@ subdirs := \ prebuilt \ + prebuilts \ build/libs/host \ build/tools/zipalign \ dalvik/dexdump \ @@ -443,6 +444,7 @@ sdk/ide_common \ sdk/jarutils \ sdk/layoutlib_api \ + sdk/manifmerger \ sdk/ninepatch \ sdk/rule_api \ sdk/lint \