zan1456/flutter
1
0
Fork 0
forked from firka/flutter
Code Pull Requests Activity

Use LOCAL_TEST_DATA to install test data am: 7e38090b57

Browse Source 
am: 62047ccb25

Change-Id: Ie02fbdc89e59707c899175dadb9700a4873f8010
This commit is contained in:
Dan Willemsen
2016-12-15 20:25:53 +00:00
committed by android-build-merger
parent 03959097a9 62047ccb25
commit 4c1fe1e28c
2 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
engine/src/flutter/tests/Android.mk
View File

@@ -18,7 +18,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
font_src_files := \
LOCAL_TEST_DATA := \
data/BoldItalic.ttf \
data/Bold.ttf \
data/ColorEmojiFont.ttf \
@@ -40,20 +40,7 @@ LOCAL_MODULE := minikin_tests
LOCAL_MODULE_TAGS := tests
LOCAL_MODULE_CLASS := NATIVE_TESTS
data_root_for_test_zip := $(local-intermediates-dir)/DATA
minikin_tests_subpath_from_data := nativetest/minikin_tests
minikin_tests_root_in_device := /data/$(minikin_tests_subpath_from_data)
minikin_tests_root_for_test_zip := $(data_root_for_test_zip)/$(minikin_tests_subpath_from_data)
GEN := $(addprefix $(minikin_tests_root_for_test_zip)/, $(font_src_files))
$(GEN): PRIVATE_PATH := $(LOCAL_PATH)
$(GEN): PRIVATE_CUSTOM_TOOL = cp $< $@
$(GEN): $(minikin_tests_root_for_test_zip)/data/% : $(LOCAL_PATH)/data/%
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
LOCAL_STATIC_LIBRARIES := libminikin
LOCAL_PICKUP_FILES := $(data_root_for_test_zip)
# Shared libraries which are dependencies of minikin; these are not automatically
# pulled in by the build system (and thus sadly must be repeated).
@@ -90,7 +77,9 @@ LOCAL_C_INCLUDES := \
external/libxml2/include \
external/skia/src/core
LOCAL_CPPFLAGS += -Werror -Wall -Wextra \
-DkTestFontDir="\"$(minikin_tests_root_in_device)/data/\""
LOCAL_CPPFLAGS += -Werror -Wall -Wextra
LOCAL_CPPFLAGS_32 += -DkTestFontDir="\"/data/nativetest/minikin_tests/data/\""
LOCAL_CPPFLAGS_64 += -DkTestFontDir="\"/data/nativetest64/minikin_tests/data/\""
include $(BUILD_NATIVE_TEST)

4
engine/src/flutter/tests/how_to_run.txt
View File

@@ -1,5 +1,3 @@
mmm -j8 frameworks/minikin/tests &&
adb push $OUT/data/nativetest/minikin_tests/minikin_tests \
/data/nativetest/minikin_tests/minikin_tests &&
adb push frameworks/minikin/tests/data /data/nativetest/minikin_tests/ &&
adb push $OUT/data/nativetest/minikin_tests /data/nativetest/ &&
adb shell /data/nativetest/minikin_tests/minikin_tests