From 7e38090b575faaebc1193291bd114dc885650087 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Fri, 9 Dec 2016 16:31:40 -0800
Subject: [PATCH] Use LOCAL_TEST_DATA to install test data

This will handle installation for local builds as well as for the test
bundles.

Test: m -j minikin_tests; ls $OUT/data/nativetest*/minikin_tests
Test: m -j continous_native_tests dist; zipinfo -1 out/dist/*continuous_native_tests*.zip
Test: /data/nativetest{,64}/minikin_tests/minikin_tests
Change-Id: Iafd31fa119e7c4d92937ca8ae8346e268a6c1f38
Merged-In: Iafd31fa119e7c4d92937ca8ae8346e268a6c1f38
---
 engine/src/flutter/tests/Android.mk     | 21 +++++----------------
 engine/src/flutter/tests/how_to_run.txt |  4 +---
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/engine/src/flutter/tests/Android.mk b/engine/src/flutter/tests/Android.mk
index bcc49193d5..2f21532377 100644
--- a/engine/src/flutter/tests/Android.mk
+++ b/engine/src/flutter/tests/Android.mk
@@ -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)
diff --git a/engine/src/flutter/tests/how_to_run.txt b/engine/src/flutter/tests/how_to_run.txt
index bee367bd17..03a55244b3 100644
--- a/engine/src/flutter/tests/how_to_run.txt
+++ b/engine/src/flutter/tests/how_to_run.txt
@@ -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