Commit 89bac02b authored by yangguo@chromium.org's avatar yangguo@chromium.org

Rename android_build_type to android_webview_build.

Rename this gyp variable to something meaningful to better explain what
it actually does.

BUG=184431

Review URL: https://chromiumcodereview.appspot.com/12605007
Patch from Richard Coles <torne@chromium.org>.

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@13916 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 173d9e8f
...@@ -35,9 +35,9 @@ ...@@ -35,9 +35,9 @@
'variables': { 'variables': {
'android_ndk_root%': '<!(/bin/echo -n $ANDROID_NDK_ROOT)', 'android_ndk_root%': '<!(/bin/echo -n $ANDROID_NDK_ROOT)',
'android_toolchain%': '<!(/bin/echo -n $ANDROID_TOOLCHAIN)', 'android_toolchain%': '<!(/bin/echo -n $ANDROID_TOOLCHAIN)',
# Switch between different build types, currently only '0' is # This is set when building the Android WebView inside the Android build
# supported. # system, using the 'android' gyp backend.
'android_build_type%': 0, 'android_webview_build%': 0,
}, },
'conditions': [ 'conditions': [
['android_ndk_root==""', { ['android_ndk_root==""', {
...@@ -62,10 +62,10 @@ ...@@ -62,10 +62,10 @@
], ],
# Enable to use the system stlport, otherwise statically # Enable to use the system stlport, otherwise statically
# link the NDK one? # link the NDK one?
'use_system_stlport%': '<(android_build_type)', 'use_system_stlport%': '<(android_webview_build)',
'android_stlport_library': 'stlport_static', 'android_stlport_library': 'stlport_static',
# Copy it out one scope. # Copy it out one scope.
'android_build_type%': '<(android_build_type)', 'android_webview_build%': '<(android_webview_build)',
'OS': 'android', 'OS': 'android',
}, # variables }, # variables
'target_defaults': { 'target_defaults': {
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
'-lm', '-lm',
], ],
'conditions': [ 'conditions': [
['android_build_type==0', { ['android_webview_build==0', {
'ldflags': [ 'ldflags': [
'-Wl,-rpath-link=<(android_lib)', '-Wl,-rpath-link=<(android_lib)',
'-L<(android_lib)', '-L<(android_lib)',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment