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

Fix generation of Android SampleApp APK now that we default to using gyp's ninja generator.

Browse Source 
R=scroggo@google.com

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/235783003

git-svn-id: http://skia.googlecode.com/svn/trunk@14212 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2014-04-15 21:37:12 +00:00
parent 0b352ed264
commit ec1ff6aa5e
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,11 @@
'CopySampleAppDeps', 'CopySampleAppDeps',
], ],
'variables': { 'variables': {
'ANDROID_SDK_ROOT': '<!(echo $ANDROID_SDK_ROOT)' 'ANDROID_SDK_ROOT': '<!(echo $ANDROID_SDK_ROOT)',
# the ninja generator treats PRODUCT_DIR as a relative path to the
# gyp directory but android ant build wants a path relative to the
# build.xml file so we do that adjustment here.
'ANDROID_OUT': '../../<(PRODUCT_DIR)/android'
}, },
'actions': [ 'actions': [
{ {
@ -81,10 +85,10 @@
'-quiet', '-quiet',
'-f', '-f',
'<(android_base)/app/build.xml', '<(android_base)/app/build.xml',
'-Dout.dir=<(PRODUCT_DIR)/android/bin', '-Dout.dir=<(ANDROID_OUT)/bin',
'-Dgen.absolute.dir=<(PRODUCT_DIR)/android/gen', '-Dgen.absolute.dir=<(ANDROID_OUT)/gen',
'-Dnative.libs.absolute.dir=<(PRODUCT_DIR)/android/libs', '-Dnative.libs.absolute.dir=<(ANDROID_OUT)/libs',
'-Dout.final.file=<(PRODUCT_DIR)/android/bin/SkiaAndroid.apk', '-Dout.final.file=<(ANDROID_OUT)/bin/SkiaAndroid.apk',
'-Dsdk.dir=<(ANDROID_SDK_ROOT)', '-Dsdk.dir=<(ANDROID_SDK_ROOT)',
'debug', 'debug',
], ],