Minimal changes required to build d8 for Android

Review URL: http://codereview.chromium.org/8554007

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@10041 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/src/d8.gyp b/src/d8.gyp
index 70186cfbdea964999d5c42d5e89f214aad050d43..bdc23a20e99b3a8ac69a91350c458f944f9f9271 100644 (file)
--- a/src/d8.gyp
+++ b/src/d8.gyp
@@ -65,7 +65,7 @@
               'sources': [ 'd8-readline.cc' ],
             }],
             [ '(OS=="linux" or OS=="mac" or OS=="freebsd" \
-              or OS=="openbsd" or OS=="solaris")', {
+              or OS=="openbsd" or OS=="solaris" or OS=="android")', {
               'sources': [ 'd8-posix.cc', ]
             }],
             [ 'OS=="win"', {

diff --git a/src/platform-posix.cc b/src/platform-posix.cc
index 4bfe54cb949ed9b80def96519f78dce5fbc1a3c6..cccf0acb3719ddc129f1bda3cfb574dd56ea6f6b 100644 (file)
--- a/src/platform-posix.cc
+++ b/src/platform-posix.cc
@@ -46,7 +46,7 @@
 
 #undef MAP_TYPE
 
-#if defined(ANDROID)
+#if defined(ANDROID) && !defined(V8_ANDROID_LOG_STDOUT)
 #define LOG_TAG "v8"
 #include <android/log.h>
 #endif