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

Upstream Android V8 change.

Browse Source 
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
This commit is contained in:
danno@chromium.org 2011-11-08 10:14:03 +00:00
parent 3d8b0a606a
commit 3628c9347c
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/platform-posix.cc
View File

@ -48,7 +48,7 @@
#if defined(ANDROID)
#define LOG_TAG "v8"
#include <utils/Log.h> // LOG_PRI_VA
#include <android/log.h>
#endif
#include "v8.h"
@ -210,7 +210,7 @@ void OS::Print(const char* format, ...) {
void OS::VPrint(const char* format, va_list args) {
#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
vprintf(format, args);
#endif
@ -227,7 +227,7 @@ void OS::FPrint(FILE* out, const char* format, ...) {
void OS::VFPrint(FILE* out, const char* format, va_list args) {
#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
vfprintf(out, format, args);
#endif
@ -244,7 +244,7 @@ void OS::PrintError(const char* format, ...) {
void OS::VPrintError(const char* format, va_list args) {
#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
vfprintf(stderr, format, args);
#endif

17
tools/gyp/v8.gyp
View File

@ -27,6 +27,15 @@
{
'includes': ['../../build/common.gypi'],
'target_conditions': [
['OS=="android" and _toolset=="target"', {
'link_settings': {
'libraries': [
'-llog',
],
}
}],
],
'conditions': [
['use_system_v8==0', {
'targets': [
@ -614,13 +623,6 @@
'../../src/platform-linux.cc'
]
}],
['_toolset=="target"', {
'link_settings': {
'libraries': [
'-llog',
],
}
}],
],
},
],
@ -755,6 +757,7 @@
'target_name': 'mksnapshot',
'type': 'executable',
'dependencies': [
'v8_base',
'v8_nosnapshot',
],
'include_dirs+': [