Index: content/content_shell.gypi |
diff --git a/content/content_shell.gypi b/content/content_shell.gypi |
index c8fc373d2b36e016dd229ea58e47376fcb784ec7..c74c8095d9eed560fccde38585dd8cc295072858 100644 |
--- a/content/content_shell.gypi |
+++ b/content/content_shell.gypi |
@@ -548,6 +548,14 @@ |
}, |
{ |
'action_name': 'content_shell_apk', |
+ 'variables': { |
+ # Pass the build type to ant. Currently it only assumes |
+ # debug mode in java. Release mode will break the current |
+ # workflow. |
+ # TODO(yongsheng): enable it once the workflow is ready |
+ # to support release mode. |
+ # 'ant_build_type%': '`if [ "<(CONFIGURATION_NAME)" = "Debug" ]; then echo "debug"; elif [ "<(CONFIGURATION_NAME)" = "Release" ]; then echo "release"; fi;`', |
John Grabowski
2012/06/26 19:30:37
<!(cmd) instead of backticks
yongsheng
2012/06/27 03:36:04
seems not workable. Because the gyp will execute i
John Grabowski
2012/06/27 16:45:58
Can you explain why it's a problem in a mk file?
|
+ }, |
'inputs': [ |
'<(DEPTH)/content/shell/android/content_shell_apk.xml', |
'<(DEPTH)/content/shell/android/AndroidManifest.xml', |
@@ -572,6 +580,7 @@ |
'-DAPP_ABI=<(android_app_abi)', |
'-buildfile', |
'<(DEPTH)/content/shell/android/content_shell_apk.xml', |
+ # '<(ant_build_type)', |
Mark Mentovai
2012/06/28 14:24:18
Why not just <(CONFIGURATION_NAME) here? It’s awfu
yongsheng
2012/06/29 02:01:46
Thanks for your comments.
How about replacing it w
Mark Mentovai
2012/06/29 02:03:54
Again, backticks aren’t guaranteed to work. I gave
yongsheng
2012/06/29 02:08:21
yes, i see. Thanks. If it doesn't work, any hint a
Mark Mentovai
2012/06/29 03:20:18
#!/bin/bash
set -eu
buildtype="$(tr '[A-Z]' '[a-z]
|
] |
} |
], |