nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 2db1e56f: Merge "Stop building host native test in unbundled build" 

* commit '2db1e56ff46fb8caefb229511878a01ad95f3d89':
  Stop building host native test in unbundled build
main
Yohei Yukawa 2014-10-23 09:43:27 +00:00 committed by Android Git Automerger
parent 8108b2eec3 2db1e56ff4
commit a81965980e
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
native/jni/HostUnitTests.mk
View File

@ -12,6 +12,9 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # 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. # HACK: Temporarily disable host tool build on Mac until the build system is ready for C++11.
LATINIME_HOST_OSNAME := $(shell uname -s) LATINIME_HOST_OSNAME := $(shell uname -s)
ifneq ($(LATINIME_HOST_OSNAME), Darwin) # TODO: Remove this 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 LOCAL_STATIC_LIBRARIES += liblatinime_host_static_for_unittests
include $(BUILD_HOST_NATIVE_TEST) include $(BUILD_HOST_NATIVE_TEST)
include $(LOCAL_PATH)/CleanupNativeFileList.mk
endif # Darwin - TODO: Remove this endif # Darwin - TODO: Remove this
endif # TARGET_BUILD_APPS
#################### Clean up the tmp vars #################### Clean up the tmp vars
LATINIME_HOST_OSNAME := LATINIME_HOST_OSNAME :=
LATIN_IME_SRC_DIR := LATIN_IME_SRC_DIR :=
LATIN_IME_TEST_SRC_DIR := LATIN_IME_TEST_SRC_DIR :=
include $(LOCAL_PATH)/CleanupNativeFileList.mk

7
native/jni/run-tests.sh
View File

@ -48,6 +48,13 @@ if [[ $show_usage == yes ]]; then
if [[ ${BASH_SOURCE[0]} != $0 ]]; then return; else exit 1; fi if [[ ${BASH_SOURCE[0]} != $0 ]]; then return; else exit 1; fi
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 target_test_name=liblatinime_target_unittests
host_test_name=liblatinime_host_unittests host_test_name=liblatinime_host_unittests