diff options
| author |   Ying Wang <wangying@google.com> | 2014-07-29 18:11:54 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-07-29 18:11:54 +0000 |
| commit | 8b6a038580554ea62ebbcefa14b577b54689d654 (patch) | |
| tree | 499472bbb6a4c9e78c7c1d989bbb4a0bce182407 | |
| parent | de10298db74ed896a1c411441281b397519f93b2 (diff) | |
| parent | 109f703023641ff1c6ecf47fbdeeb5ab01042d8d (diff) | |
| download | latinime-8b6a038580554ea62ebbcefa14b577b54689d654.tar.gz latinime-8b6a038580554ea62ebbcefa14b577b54689d654.tar.xz latinime-8b6a038580554ea62ebbcefa14b577b54689d654.zip | |
am 109f7030: am 0b2e2db9: am ece7240c: Don\'t build dicttool unless it\'s explicitly requested.
* commit '109f703023641ff1c6ecf47fbdeeb5ab01042d8d':
Don't build dicttool unless it's explicitly requested.
| -rw-r--r-- | tools/dicttool/Android.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/dicttool/Android.mk b/tools/dicttool/Android.mk index b108a8a81..e4de59db6 100644 --- a/tools/dicttool/Android.mk +++ b/tools/dicttool/Android.mk @@ -13,6 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +# Only build if it's explicitly requested, or running mm/mmm. +ifneq ($(ONE_SHOT_MAKEFILE)$(filter $(MAKECMDGOALS),dicttool_aosp),) + # HACK: Temporarily disable host tool build on Mac until the build system is ready for C++11. LATINIME_HOST_OSNAME := $(shell uname -s) ifeq ($(LATINIME_HOST_OSNAME), Darwin) # TODO: Remove this @@ -98,3 +101,5 @@ endif # Darwin - TODO: Remove this LATINIME_DICTTOOL_AOSP_LOCAL_PATH := LATINIME_LOCAL_DIR := LATINIME_HOST_OSNAME := + +endif |