From be7c33a74ed7a8a30d4ff6d8cbfa1308050256a7 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 2 Dec 2016 18:04:42 -0800 Subject: [PATCH] Move LOCAL_PICKUP_FILES out of $OUT/data minikin_tests was copying its test data to $OUT/data/DATA/nativetest/minikin_test, and then packaging that with LOCAL_PICKUP_FILES=$OUT/data/DATA, which would also pick up anything any other module copyied to $OUT/data/DATA. $OUT/data/DATA isn't where the tests expect to find their data, they look in /data/nativetest/minikin_test. Copy the files to the intermediates directory instead. A future change will install LOCAL_PICKUP_FILES for local builds to the correct place, so adb sync and adb shell /data/nativetest/minikin_tests/minikin_tests will run the tests. Test: mma -j Change-Id: I808ce743f51e5ccac711e22821e7e0d7cd94ffdf --- engine/src/flutter/tests/Android.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/engine/src/flutter/tests/Android.mk b/engine/src/flutter/tests/Android.mk index b33631eb28..bcc49193d5 100644 --- a/engine/src/flutter/tests/Android.mk +++ b/engine/src/flutter/tests/Android.mk @@ -18,11 +18,6 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -data_root_for_test_zip := $(TARGET_OUT_DATA)/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) - font_src_files := \ data/BoldItalic.ttf \ data/Bold.ttf \ @@ -43,6 +38,12 @@ font_src_files := \ 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)