diff options
| author |   Yohei Yukawa <yukawa@google.com> | 2014-10-23 09:39:56 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-10-23 09:39:56 +0000 |
| commit | 2db1e56ff46fb8caefb229511878a01ad95f3d89 (patch) | |
| tree | ed0c1d2bf3e1e766c316f2420a2c81504c227c93 | |
| parent | e71c951c108416edc05255a0782d1cca2962dc28 (diff) | |
| parent | ba35bb83a87eff69adeefc08da901a856058e5f0 (diff) | |
| download | latinime-2db1e56ff46fb8caefb229511878a01ad95f3d89.tar.gz latinime-2db1e56ff46fb8caefb229511878a01ad95f3d89.tar.xz latinime-2db1e56ff46fb8caefb229511878a01ad95f3d89.zip | |
Merge "Stop building host native test in unbundled build"
| -rw-r--r-- | native/jni/HostUnitTests.mk | 8 | ||||
| -rwxr-xr-x | native/jni/run-tests.sh | 7 |
2 files changed, 14 insertions, 1 deletions
diff --git a/native/jni/HostUnitTests.mk b/native/jni/HostUnitTests.mk index 6967d9b87..40ec2558e 100644 --- a/native/jni/HostUnitTests.mk +++ b/native/jni/HostUnitTests.mk @@ -12,6 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +# Host build is never supported in unbundled (NDK/tapas) build +ifeq (,$(TARGET_BUILD_APPS)) + # HACK: Temporarily disable host tool build on Mac until the build system is ready for C++11. LATINIME_HOST_OSNAME := $(shell uname -s) ifneq ($(LATINIME_HOST_OSNAME), Darwin) # TODO: Remove this @@ -47,10 +50,13 @@ LOCAL_SRC_FILES := $(addprefix $(LATIN_IME_TEST_SRC_DIR)/, $(LATIN_IME_CORE_TEST LOCAL_STATIC_LIBRARIES += liblatinime_host_static_for_unittests include $(BUILD_HOST_NATIVE_TEST) +include $(LOCAL_PATH)/CleanupNativeFileList.mk + endif # Darwin - TODO: Remove this +endif # TARGET_BUILD_APPS + #################### Clean up the tmp vars LATINIME_HOST_OSNAME := LATIN_IME_SRC_DIR := LATIN_IME_TEST_SRC_DIR := -include $(LOCAL_PATH)/CleanupNativeFileList.mk diff --git a/native/jni/run-tests.sh b/native/jni/run-tests.sh index 3da45270d..a7fa82d9b 100755 --- a/native/jni/run-tests.sh +++ b/native/jni/run-tests.sh @@ -48,6 +48,13 @@ if [[ $show_usage == yes ]]; then if [[ ${BASH_SOURCE[0]} != $0 ]]; then return; else exit 1; fi fi +# Host build is never supported in unbundled (NDK/tapas) build +if [[ $enable_host_test == yes && -n $TARGET_BUILD_APPS ]]; then + echo "Host build is never supported in tapas build." 1>&2 + echo "Use lunch command instead." 1>&2 + if [[ ${BASH_SOURCE[0]} != $0 ]]; then return; else exit 1; fi +fi + target_test_name=liblatinime_target_unittests host_test_name=liblatinime_host_unittests |