firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move LOCAL_PICKUP_FILES out of $OUT/data"

Browse Source 
am: 8d6a018645

Change-Id: I0aac6741d2c92bbe46fdf89931460fbb41acc1ea
This commit is contained in:
Colin Cross
2016-12-09 02:01:37 +00:00
committed by android-build-merger
parent b4c239f555 8d6a018645
commit 77f96edc2f
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)