From ec1ff6aa5e45c2bb0384387efc23cef77850b786 Mon Sep 17 00:00:00 2001
From: "commit-bot@chromium.org"
 <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>
Date: Tue, 15 Apr 2014 21:37:12 +0000
Subject: Fix generation of Android SampleApp APK now that we default to using
 gyp's ninja generator.

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
---
 platform_tools/android/gyp/skia_android.gypi | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'platform_tools/android/gyp')

diff --git a/platform_tools/android/gyp/skia_android.gypi b/platform_tools/android/gyp/skia_android.gypi
index 270b934baf..29813691ab 100644
--- a/platform_tools/android/gyp/skia_android.gypi
+++ b/platform_tools/android/gyp/skia_android.gypi
@@ -58,7 +58,11 @@
         'CopySampleAppDeps',
       ],
       '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': [
         {
@@ -81,10 +85,10 @@
             '-quiet',
             '-f',
             '<(android_base)/app/build.xml',
-            '-Dout.dir=<(PRODUCT_DIR)/android/bin',
-            '-Dgen.absolute.dir=<(PRODUCT_DIR)/android/gen',
-            '-Dnative.libs.absolute.dir=<(PRODUCT_DIR)/android/libs',
-            '-Dout.final.file=<(PRODUCT_DIR)/android/bin/SkiaAndroid.apk',
+            '-Dout.dir=<(ANDROID_OUT)/bin',
+            '-Dgen.absolute.dir=<(ANDROID_OUT)/gen',
+            '-Dnative.libs.absolute.dir=<(ANDROID_OUT)/libs',
+            '-Dout.final.file=<(ANDROID_OUT)/bin/SkiaAndroid.apk',
             '-Dsdk.dir=<(ANDROID_SDK_ROOT)',
             'debug',
           ],
-- 
cgit v1.2.3