AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix repeat builds with Android.

Browse Source 
Currently the SampleApp and VisualBench builds for Android don't work
for rebuilds. The code is re-built, but the apks are not. This
results from the use of a directory as 'output' and the action to
build the apk not depending on the copied libraries.

Review URL: https://codereview.chromium.org/1270643005
This commit is contained in:
bungeman 2015-07-31 06:33:21 -07:00 committed by Commit bot
parent 76cc6575a4
commit 15bde1697a
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
platform_tools/android/gyp/skia_android.gypi
View File

@ -86,9 +86,17 @@
'<(android_base)/apps/sample_app/src/main/java/com/skia/SkiaSampleActivity.java', '<(android_base)/apps/sample_app/src/main/java/com/skia/SkiaSampleActivity.java',
'<(android_base)/apps/sample_app/src/main/java/com/skia/SkiaSampleRenderer.java', '<(android_base)/apps/sample_app/src/main/java/com/skia/SkiaSampleRenderer.java',
'<(android_base)/apps/sample_app/src/main/java/com/skia/SkiaSampleView.java', '<(android_base)/apps/sample_app/src/main/java/com/skia/SkiaSampleView.java',
'<(android_base)/apps/sample_app/src/main/libs/<(android_arch)/libSampleApp.so',
],
'conditions': [
[ 'skia_shared_lib', {
'inputs': [
'<(android_base)/apps/sample_app/src/main/libs/<(android_arch)/libskia_android.so',
],
}],
], ],
'outputs': [ 'outputs': [
'<(android_base)/apps/sample_app/build', '<(android_base)/apps/sample_app/build/outputs/apk/sample_app-arm-debug.apk',
], ],
'action': [ 'action': [
'<(android_base)/apps/gradlew', '<(android_base)/apps/gradlew',
@ -141,9 +149,17 @@
'inputs': [ 'inputs': [
'<(android_base)/apps/visualbench/src/main/AndroidManifest.xml', '<(android_base)/apps/visualbench/src/main/AndroidManifest.xml',
'<(android_base)/apps/visualbench/src/main/java/com/skia/VisualBenchActivity.java', '<(android_base)/apps/visualbench/src/main/java/com/skia/VisualBenchActivity.java',
'<(android_base)/apps/visualbench/src/main/libs/<(android_arch)/libvisualbench.so',
],
'conditions': [
[ 'skia_shared_lib', {
'inputs': [
'<(android_base)/apps/visualbench/src/main/libs/<(android_arch)/libskia_android.so',
],
}],
], ],
'outputs': [ 'outputs': [
'<(android_base)/apps/visualbench/build', '<(android_base)/apps/visualbench/build/outputs/apk/visualbench-arm-debug.apk',
], ],
'action': [ 'action': [
'<(android_base)/apps/gradlew', '<(android_base)/apps/gradlew',