Fixed public build for jre_emul tests.
@@ -89,6 +89,7 @@ TRANSLATE_SOURCES = \
$(TEST_SOURCES) \
$(JSON_TEST_SOURCES) \
$(SUITE_SOURCES) \
+ $(JSON_SUITE_SOURCES) \
$(ALL_TESTS_CLASS).java
TRANSLATE_SOURCES_ARC = $(ARC_TEST_SOURCES) $(COPIED_ARC_TEST_SOURCES)
TRANSLATED_OBJC = $(TRANSLATE_SOURCES:%.java=$(TESTS_DIR)/%.m)
@@ -98,7 +99,7 @@ TRANSLATE_ARTIFACT := $(call emit_translate_rule,\
jre_emul_tests,\
$(TESTS_DIR),\
$(SUPPORT_SOURCES) $(MOCKWEBSERVER_SOURCES) $(TEST_SOURCES) $(JSON_TEST_SOURCES) \
- $(SUITE_SOURCES) $(ALL_TESTS_SOURCE),\
+ $(SUITE_SOURCES) $(JSON_SUITE_SOURCES) $(ALL_TESTS_SOURCE),\
,\
$(TRANSLATE_ARGS))
@@ -301,7 +302,7 @@ $(TESTS_DIR)/%.o: $(ANDROID_NATIVE_TEST_DIR)/%.cpp | $(TESTS_DIR)
xcrun cc -g -I$(EMULATION_CLASS_DIR) -x objective-c++ -c $? -o $@ \
-Werror -Wno-parentheses $(GCOV_FLAGS)
-$(TEST_BIN): $(TEST_OBJS) $(SUPPORT_LIB) $(DIST_JRE_EMUL_LIB) $(DIST_JUNIT_LIB) $(DIST_JUNIT_LIB)
+$(TEST_BIN): $(TEST_OBJS) $(SUPPORT_LIB) $(DIST_JRE_EMUL_LIB) $(DIST_JSON_LIB) $(DIST_JUNIT_LIB)
@echo Building test executable...
@echo " " $(TEST_JOCC) $(LINK_FLAGS) ...
@$(TEST_JOCC) $(LINK_FLAGS) -o $@ $(TEST_OBJS)
