Reviewers: Søren Gjesse,

Description:
Strcmp thinko and SConstruct improvement for d8 on Android.

Please review this at http://codereview.chromium.org/42560

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

Affected files:
   M     SConstruct
   M     src/d8.cc


Index: src/d8.cc
===================================================================
--- src/d8.cc   (revision 1599)
+++ src/d8.cc   (working copy)
@@ -97,7 +97,7 @@
  bool CounterMap::Match(void* key1, void* key2) {
    const char* name1 = reinterpret_cast<const char*>(key1);
    const char* name2 = reinterpret_cast<const char*>(key2);
-  return strcmp(name1, name2) != 0;
+  return strcmp(name1, name2) == 0;
  }


Index: SConstruct
===================================================================
--- SConstruct  (revision 1599)
+++ SConstruct  (working copy)
@@ -386,6 +386,20 @@
      'os:freebsd': {
        'LIBS': ['pthread'],
      },
+    'os:android': {
+      'LIBPATH':     [ANDROID_TOP + '/out/target/product/generic/obj/lib'],
+      'LINKFLAGS':    ['-nostdlib',
+                       '-Bdynamic',
+                       '-Wl,-T,' + ANDROID_TOP + '/build/core/armelf.x',
+                       '-Wl,-dynamic-linker,/system/bin/linker',
+                       '-Wl,--gc-sections',
+                       '-Wl,-z,nocopyreloc',
+                       '-Wl,-rpath-link=' + ANDROID_TOP  
+ '/out/target/product/generic/obj/lib',
+                       ANDROID_TOP  
+ '/out/target/product/generic/obj/lib/crtbegin_dynamic.o',
+                       ANDROID_TOP  
+ 
'/prebuilt/linux-x86/toolchain/arm-eabi-4.2.1/lib/gcc/arm-eabi/4.2.1/interwork/libgcc.a',
+                       ANDROID_TOP  
+ '/out/target/product/generic/obj/lib/crtend_android.o'],
+      'LIBS':         ['c', 'stdc++', 'm'],
+    },
      'os:win32': {
        'LIBS': ['winmm', 'ws2_32'],
      },



--~--~---------~--~----~------------~-------~--~----~
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
-~----------~----~----~----~------~----~------~--~---

Reply via email to