diff options
| author | Raphael Moll <ralf@android.com> | 2011-07-29 14:34:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-29 14:34:01 -0700 |
| commit | b194b9d185bfb521ba7ad0a8773906e7facb3fcb (patch) | |
| tree | d170bca9d546947597dd838c0591b6a87da3996e /core/main.mk | |
| parent | 603755d6cebc50d2f9debeec284f6614e085170d (diff) | |
| parent | dd9e8477e6cc1a8de556dd7942fb81c049e2e373 (diff) | |
| download | build-b194b9d185bfb521ba7ad0a8773906e7facb3fcb.zip build-b194b9d185bfb521ba7ad0a8773906e7facb3fcb.tar.gz build-b194b9d185bfb521ba7ad0a8773906e7facb3fcb.tar.bz2 | |
am dd9e8477: am 266a571f: am dceb4655: Merge "Add sdk/assetstudio to the Windows build paths."
* commit 'dd9e8477e6cc1a8de556dd7942fb81c049e2e373':
Add sdk/assetstudio to the Windows build paths.
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 959cd83..571e779 100644 --- a/core/main.mk +++ b/core/main.mk @@ -429,6 +429,7 @@ subdirs += \ sdk/archquery \ sdk/androidprefs \ sdk/apkbuilder \ + sdk/assetstudio \ sdk/common \ sdk/ddms \ sdk/hierarchyviewer2 \ |