Revert "Build arm and x86 binaries at the same time."
This fails to build on MacOS X
This reverts commit a39b10bd2574825a815d6ad854499dd127cfa9cb.
diff --git a/android/help.c b/android/help.c
index a2180ef..7df6704 100644
--- a/android/help.c
+++ b/android/help.c
@@ -213,7 +213,6 @@
datadir );
}
-#ifndef CONFIG_STANDALONE_CORE
static void
help_keys(stralloc_t* out)
{
@@ -254,7 +253,7 @@
PRINTF( "\n" );
PRINTF( " note that NumLock must be deactivated for keypad keys to work\n\n" );
}
-#endif /* !CONFIG_STANDALONE_CORE */
+
static void
help_environment(stralloc_t* out)
@@ -286,7 +285,7 @@
);
}
-#ifndef CONFIG_STANDALONE_CORE
+
static void
help_keyset_file(stralloc_t* out)
{
@@ -356,7 +355,7 @@
"\n"
);
}
-#endif /* !CONFIG_STANDALONE_CORE */
+
static void
help_debug_tags(stralloc_t* out)
@@ -1305,7 +1304,6 @@
}
-#ifndef CONFIG_STANDALONE_CORE
static void
help_keyset(stralloc_t* out)
{
@@ -1345,7 +1343,6 @@
"\n"
);
}
-#endif /* !CONFIG_STANDALONE_CORE */
static void
help_old_system(stralloc_t* out)
@@ -1497,15 +1494,11 @@
static const TopicHelp topic_help[] = {
{ "disk-images", "about disk images", help_disk_images },
-#ifndef CONFIG_STANDALONE_CORE
{ "keys", "supported key bindings", help_keys },
-#endif
{ "debug-tags", "debug tags for -debug <tags>", help_debug_tags },
{ "char-devices", "character <device> specification", help_char_devices },
{ "environment", "environment variables", help_environment },
-#ifndef CONFIG_STANDALONE_CORE
{ "keyset-file", "key bindings configuration file", help_keyset_file },
-#endif
{ "virtual-device", "virtual device management", help_virtual_device },
{ "sdk-images", "about disk images when using the SDK", help_sdk_images },
{ "build-images", "about disk images when building Android", help_build_images },