Reviewers: ulan,

Description:
Set OS=android via GYP_DEFINES

Otherwise, the variable isn't available in all scopes. Instead of playing around
with nested scopes, we just set it in GYP_DEFINES (same as chromium does)

BUG=v8:3405
[email protected]
LOG=n

Please review this at https://codereview.chromium.org/357643002/

SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge

Affected files (+1, -1 lines):
  M Makefile.android
  M build/android.gypi


Index: Makefile.android
diff --git a/Makefile.android b/Makefile.android
index b06d9e52a2a421d4941fae82fa80366f66b51364..02c63f6aa77b1fc2fff545ef9fca6137e8d7bc26 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -98,6 +98,7 @@ endif

 # For mksnapshot host generation.
 DEFINES += host_os=${HOST_OS}
+DEFINES += OS=android

 .SECONDEXPANSION:
 $(ANDROID_BUILDS): $(OUTDIR)/Makefile.$$@
Index: build/android.gypi
diff --git a/build/android.gypi b/build/android.gypi
index 5c6fb321b4a73da2302e064c699c5809fd89c52c..098109eb3ed751307c058079213363e0fe067acb 100644
--- a/build/android.gypi
+++ b/build/android.gypi
@@ -66,7 +66,6 @@
     'android_stlport_library': 'stlport_static',
     # Copy it out one scope.
     'android_webview_build%': '<(android_webview_build)',
-    'OS': 'android',
   },  # variables
   'target_defaults': {
     'defines': [


--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to