From 816b77e7c07dfa46cd08045e113c53d67466f7a5 Mon Sep 17 00:00:00 2001
From: folecr <folecr@gmail.com>
Date: Fri, 22 Mar 2013 13:55:33 -0700
Subject: [PATCH] simplegame : enable building native library for x86

---
 samples/Cpp/SimpleGame/proj.android/jni/Application.mk | 1 +
 samples/Javascript/Shared                              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/samples/Cpp/SimpleGame/proj.android/jni/Application.mk b/samples/Cpp/SimpleGame/proj.android/jni/Application.mk
index 988bf2fadc..8b71d65317 100644
--- a/samples/Cpp/SimpleGame/proj.android/jni/Application.mk
+++ b/samples/Cpp/SimpleGame/proj.android/jni/Application.mk
@@ -1,2 +1,3 @@
 APP_STL := gnustl_static
 APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -std=c++11
+APP_ABI := armeabi x86
diff --git a/samples/Javascript/Shared b/samples/Javascript/Shared
index 714ea94824..4b2abcc698 160000
--- a/samples/Javascript/Shared
+++ b/samples/Javascript/Shared
@@ -1 +1 @@
-Subproject commit 714ea9482432a94a2d58ca265c97c61b5b369919
+Subproject commit 4b2abcc698d5186c6c8d5cb336a6eefea0c15b52