Index: platform_tools/android/gyp/skia_android.gypi |
diff --git a/platform_tools/android/gyp/skia_android.gypi b/platform_tools/android/gyp/skia_android.gypi |
index 92ee5ddd9d4ead5c60b5cc474544acc9f7ed7dfd..e724a4dffe2005d23c2064bf99095e347b26d4cb 100644 |
--- a/platform_tools/android/gyp/skia_android.gypi |
+++ b/platform_tools/android/gyp/skia_android.gypi |
@@ -39,9 +39,11 @@ |
'android_variant%': "mips64", |
}], |
[ 'android_buildtype == "Release"', { |
- 'android_apk_suffix': "release.apk", |
+ 'android_apk_suffix': 'release.apk', |
+ 'android_test_apk_suffix': 'release-androidTest.apk', |
}, { |
- 'android_apk_suffix': "debug.apk", |
+ 'android_apk_suffix': 'debug.apk', |
+ 'android_test_apk_suffix': 'debug-androidTest-unaligned.apk', |
djsollen
2015/08/31 16:09:37
I'm not sure these new suffix variables are correc
djsollen
2015/08/31 16:16:08
Looking at it some more I think the changes to thi
borenet
2015/08/31 16:18:34
Yeah, I think you're right. Removed the changes t
|
}], |
], |
}, |
@@ -198,7 +200,7 @@ |
}], |
], |
'outputs': [ |
- '<(android_base)/apps/visualbench/build/outputs/apk/visualbench-<(android_variant)-debug-androidTest-unaligned.apk', |
+ '<(android_base)/apps/visualbench/build/outputs/apk/visualbench-<(android_variant)-<(android_test_apk_suffix)', |
], |
'action': [ |
'<(android_base)/apps/gradlew', |