diff options
| author |   Yohei Yukawa <yukawa@google.com> | 2014-10-23 17:58:00 +0900 |
|---|---|---|
| committer | Yohei Yukawa <yukawa@google.com> | 2014-10-23 18:31:06 +0900 |
| commit | ba35bb83a87eff69adeefc08da901a856058e5f0 (patch) | |
| tree | 15187e4be90851704ec05cb8af67636c8dd31c58 | |
| parent | 9c0b3419dad52a91695eec52090b6f53a35b42e8 (diff) | |
| download | latinime-ba35bb83a87eff69adeefc08da901a856058e5f0.tar.gz latinime-ba35bb83a87eff69adeefc08da901a856058e5f0.tar.xz latinime-ba35bb83a87eff69adeefc08da901a856058e5f0.zip | |
Stop building host native test in unbundled build
It turned out that building native code for host environment
is not supported in NDK build. Hence this CL makes the host
native test available only as a part of platform build to
avoid accidental build breakage in unbundled build.
BUG: 18095678
Change-Id: If608da166d5a478358e6890b8db526b4c2c0ab41
| -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 |