AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Rename android_build_type to android_webview_build.

Browse Source 
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
This commit is contained in:
yangguo@chromium.org 2013-03-12 17:35:33 +00:00
parent 173d9e8f4a
commit 89bac02bac
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/android.gypi
View File

@ -35,9 +35,9 @@
'variables': {
'android_ndk_root%': '<!(/bin/echo -n $ANDROID_NDK_ROOT)',
'android_toolchain%': '<!(/bin/echo -n $ANDROID_TOOLCHAIN)',
# Switch between different build types, currently only '0' is
# supported.
'android_build_type%': 0,
# This is set when building the Android WebView inside the Android build
# system, using the 'android' gyp backend.
'android_webview_build%': 0,
},
'conditions': [
['android_ndk_root==""', {
@ -62,10 +62,10 @@
],
# Enable to use the system stlport, otherwise statically
# link the NDK one?
'use_system_stlport%': '<(android_build_type)',
'use_system_stlport%': '<(android_webview_build)',
'android_stlport_library': 'stlport_static',
# Copy it out one scope.
'android_build_type%': '<(android_build_type)',
'android_webview_build%': '<(android_webview_build)',
'OS': 'android',
}, # variables
'target_defaults': {
@ -141,7 +141,7 @@
'-lm',
],
'conditions': [
['android_build_type==0', {
['android_webview_build==0', {
'ldflags': [
'-Wl,-rpath-link=<(android_lib)',
'-L<(android_lib)',