Commit 3628c934 authored by danno@chromium.org's avatar danno@chromium.org

Upstream Android V8 change.

Review URL: http://codereview.chromium.org/8351073
Patch from Jing Zhao <jingzhao@chromium.org>.

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@9904 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 3d8b0a60
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
#if defined(ANDROID) #if defined(ANDROID)
#define LOG_TAG "v8" #define LOG_TAG "v8"
#include <utils/Log.h> // LOG_PRI_VA #include <android/log.h>
#endif #endif
#include "v8.h" #include "v8.h"
...@@ -210,7 +210,7 @@ void OS::Print(const char* format, ...) { ...@@ -210,7 +210,7 @@ void OS::Print(const char* format, ...) {
void OS::VPrint(const char* format, va_list args) { void OS::VPrint(const char* format, va_list args) {
#if defined(ANDROID) && !defined(V8_ANDROID_LOG_STDOUT) #if defined(ANDROID) && !defined(V8_ANDROID_LOG_STDOUT)
LOG_PRI_VA(ANDROID_LOG_INFO, LOG_TAG, format, args); __android_log_vprint(ANDROID_LOG_INFO, LOG_TAG, format, args);
#else #else
vprintf(format, args); vprintf(format, args);
#endif #endif
...@@ -227,7 +227,7 @@ void OS::FPrint(FILE* out, const char* format, ...) { ...@@ -227,7 +227,7 @@ void OS::FPrint(FILE* out, const char* format, ...) {
void OS::VFPrint(FILE* out, const char* format, va_list args) { void OS::VFPrint(FILE* out, const char* format, va_list args) {
#if defined(ANDROID) && !defined(V8_ANDROID_LOG_STDOUT) #if defined(ANDROID) && !defined(V8_ANDROID_LOG_STDOUT)
LOG_PRI_VA(ANDROID_LOG_INFO, LOG_TAG, format, args); __android_log_vprint(ANDROID_LOG_INFO, LOG_TAG, format, args);
#else #else
vfprintf(out, format, args); vfprintf(out, format, args);
#endif #endif
...@@ -244,7 +244,7 @@ void OS::PrintError(const char* format, ...) { ...@@ -244,7 +244,7 @@ void OS::PrintError(const char* format, ...) {
void OS::VPrintError(const char* format, va_list args) { void OS::VPrintError(const char* format, va_list args) {
#if defined(ANDROID) && !defined(V8_ANDROID_LOG_STDOUT) #if defined(ANDROID) && !defined(V8_ANDROID_LOG_STDOUT)
LOG_PRI_VA(ANDROID_LOG_ERROR, LOG_TAG, format, args); __android_log_vprint(ANDROID_LOG_ERROR, LOG_TAG, format, args);
#else #else
vfprintf(stderr, format, args); vfprintf(stderr, format, args);
#endif #endif
......
...@@ -27,6 +27,15 @@ ...@@ -27,6 +27,15 @@
{ {
'includes': ['../../build/common.gypi'], 'includes': ['../../build/common.gypi'],
'target_conditions': [
['OS=="android" and _toolset=="target"', {
'link_settings': {
'libraries': [
'-llog',
],
}
}],
],
'conditions': [ 'conditions': [
['use_system_v8==0', { ['use_system_v8==0', {
'targets': [ 'targets': [
...@@ -614,13 +623,6 @@ ...@@ -614,13 +623,6 @@
'../../src/platform-linux.cc' '../../src/platform-linux.cc'
] ]
}], }],
['_toolset=="target"', {
'link_settings': {
'libraries': [
'-llog',
],
}
}],
], ],
}, },
], ],
...@@ -755,6 +757,7 @@ ...@@ -755,6 +757,7 @@
'target_name': 'mksnapshot', 'target_name': 'mksnapshot',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'v8_base',
'v8_nosnapshot', 'v8_nosnapshot',
], ],
'include_dirs+': [ 'include_dirs+': [
......
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