Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(54)

Side by Side Diff: platform_tools/android/tests/expectations/tool/Android.mk

Issue 1119283004: Update how we package skia resource for android testing (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « platform_tools/android/gyp_gen/tool_makefile_writer.py ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 ############################################################################### 2 ###############################################################################
3 # 3 #
4 # THIS FILE IS AUTOGENERATED BY GYP_TO_ANDROID.PY. DO NOT EDIT. 4 # THIS FILE IS AUTOGENERATED BY GYP_TO_ANDROID.PY. DO NOT EDIT.
5 # 5 #
6 # For bugs, please contact scroggo@google.com or djsollen@google.com 6 # For bugs, please contact scroggo@google.com or djsollen@google.com
7 # 7 #
8 ############################################################################### 8 ###############################################################################
9 9
10 LOCAL_PATH:= $(call my-dir) 10 LOCAL_PATH:= $(call my-dir)
(...skipping 22 matching lines...) Expand all
33 LOCAL_CFLAGS += \ 33 LOCAL_CFLAGS += \
34 -Ddefines 34 -Ddefines
35 35
36 LOCAL_MODULE_TAGS := \ 36 LOCAL_MODULE_TAGS := \
37 local_module_tags 37 local_module_tags
38 38
39 LOCAL_MODULE := \ 39 LOCAL_MODULE := \
40 local_module 40 local_module
41 41
42 42
43 # Setup directory to store skia's resources in the directory structure that 43 # Store skia's resources in the directory structure that the Android testing
44 # the Android testing infrastructure expects 44 # infrastructure expects. This requires that Skia maintain a symlinked
45 skia_res_dir := $(call intermediates-dir-for,PACKAGING,skia_resources)/DATA 45 # subdirectory in the DATA folder that points to the top level skia resources...
46 $(shell mkdir -p $(skia_res_dir)) 46 # i.e. external/skia/DATA/skia_resources --> ../resources
47 $(shell cp -r $(LOCAL_PATH)/../resources/. $(skia_res_dir)/skia_resources) 47 LOCAL_PICKUP_FILES := $(LOCAL_PATH)/../DATA
48 LOCAL_PICKUP_FILES := $(skia_res_dir)
49 skia_res_dir :=
50
51 include $(BUILD_NATIVE_TEST) 48 include $(BUILD_NATIVE_TEST)
OLDNEW
« no previous file with comments | « platform_tools/android/gyp_gen/tool_makefile_writer.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698