aboutsummaryrefslogtreecommitdiffstats
path: root/tools/dicttool
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-07-29 18:01:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-29 18:01:24 +0000
commit0b2e2db9192186f60ec587b019700e3ce83124b0 (patch)
tree08438101d8100e62576206a734c2c0f9c0297385 /tools/dicttool
parentc9bba853fa00f03bfc9b49931e320957adc15b20 (diff)
parentece7240c7ac09b1448998c202f991d0acd4bab01 (diff)
downloadlatinime-0b2e2db9192186f60ec587b019700e3ce83124b0.tar.gz
latinime-0b2e2db9192186f60ec587b019700e3ce83124b0.tar.xz
latinime-0b2e2db9192186f60ec587b019700e3ce83124b0.zip
am ece7240c: Don\'t build dicttool unless it\'s explicitly requested.
* commit 'ece7240c7ac09b1448998c202f991d0acd4bab01': Don't build dicttool unless it's explicitly requested.
Diffstat (limited to 'tools/dicttool')
-rw-r--r--tools/dicttool/Android.mk5
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