Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eee3201c authored by Dan Albert's avatar Dan Albert Committed by android-build-merger
Browse files

Merge "Stop mixing and matching platform and NDK." 

am: b0d902f2

* commit 'b0d902f2':
  Stop mixing and matching platform and NDK.
parents 126c6bdd b0d902f2

native/jni/TargetUnitTests.mk

+3 −3
Original line number Diff line number Diff line
@@ -27,10 +27,8 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR) 
LOCAL_MODULE := liblatinime_target_static_for_unittests

LOCAL_MODULE_TAGS := optional

LOCAL_SRC_FILES := $(addprefix $(LATIN_IME_SRC_DIR)/, $(LATIN_IME_CORE_SRC_FILES))

# Here intentionally use libc++_shared rather than libc++_static because

# $(BUILD_NATIVE_TEST) has not yet supported libc++_static.

LOCAL_SDK_VERSION := 14

LOCAL_NDK_STL_VARIANT := c++_shared

LOCAL_NDK_STL_VARIANT := c++_static

include $(BUILD_STATIC_LIBRARY)



#################### Target native tests
@@ -44,6 +42,8 @@ LOCAL_MODULE_TAGS := tests 
LOCAL_SRC_FILES :=  \

    $(addprefix $(LATIN_IME_TEST_SRC_DIR)/, $(LATIN_IME_CORE_TEST_FILES))

LOCAL_STATIC_LIBRARIES += liblatinime_target_static_for_unittests

LOCAL_SDK_VERSION := 14

LOCAL_NDK_STL_VARIANT := c++_static

include $(BUILD_NATIVE_TEST)



#################### Clean up the tmp vars