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

Side by Side Diff: platform_tools/android/gyp/skia_android.gypi

Issue 344213003: Move BenchTimer to tools as Timer (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: fixes Created 6 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
OLDNEW
1 { 1 {
2 'targets': [ 2 'targets': [
3 { 3 {
4 'target_name': 'CopySampleAppDeps', 4 'target_name': 'CopySampleAppDeps',
5 'type': 'none', 5 'type': 'none',
6 'dependencies': [ 6 'dependencies': [
7 'skia_lib.gyp:skia_lib', 7 'skia_lib.gyp:skia_lib',
8 'SampleApp.gyp:SampleApp', 8 'SampleApp.gyp:SampleApp',
9 ], 9 ],
10 'variables': { 10 'variables': {
(...skipping 27 matching lines...) Expand all
38 ]}, { 38 ]}, {
39 'files': [ 39 'files': [
40 '<(SHARED_LIB_DIR)/libSampleApp.so', 40 '<(SHARED_LIB_DIR)/libSampleApp.so',
41 ]} 41 ]}
42 ], 42 ],
43 ], 43 ],
44 }, 44 },
45 ], 45 ],
46 }, 46 },
47 { 47 {
48 'target_name': 'skia_launcher',
49 'type': 'executable',
50 'sources': [
51 '../launcher/skia_launcher.cpp',
52 ],
53 },
54 {
55 'target_name': 'SampleApp_APK', 48 'target_name': 'SampleApp_APK',
56 'type': 'none', 49 'type': 'none',
57 'dependencies': [ 50 'dependencies': [
58 'CopySampleAppDeps', 51 'CopySampleAppDeps',
59 ], 52 ],
60 'variables': { 53 'variables': {
61 'ANDROID_SDK_ROOT': '<!(echo $ANDROID_SDK_ROOT)', 54 'ANDROID_SDK_ROOT': '<!(echo $ANDROID_SDK_ROOT)',
62 # the ninja generator treats PRODUCT_DIR as a relative path to the 55 # the ninja generator treats PRODUCT_DIR as a relative path to the
63 # gyp directory but android ant build wants a path relative to the 56 # gyp directory but android ant build wants a path relative to the
64 # build.xml file so we do that adjustment here. 57 # build.xml file so we do that adjustment here.
(...skipping 25 matching lines...) Expand all
90 '-Dnative.libs.absolute.dir=<(ANDROID_OUT)/libs', 83 '-Dnative.libs.absolute.dir=<(ANDROID_OUT)/libs',
91 '-Dout.final.file=<(ANDROID_OUT)/bin/SkiaAndroid.apk', 84 '-Dout.final.file=<(ANDROID_OUT)/bin/SkiaAndroid.apk',
92 '-Dsdk.dir=<(ANDROID_SDK_ROOT)', 85 '-Dsdk.dir=<(ANDROID_SDK_ROOT)',
93 'debug', 86 'debug',
94 ], 87 ],
95 }, 88 },
96 ], 89 ],
97 }, 90 },
98 ], 91 ],
99 } 92 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698