diff --git a/lib/Android.mk b/lib/Android.mk
index 34f2394..a86de8b 100644
--- a/lib/Android.mk
+++ b/lib/Android.mk
@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ifeq ($(HOST_OS)-$(HOST_ARCH),linux-x86)
-
 LOCAL_PATH := $(call my-dir)
 
 LOCAL_PREBUILT_LIBS := \
@@ -24,5 +22,3 @@
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_PREBUILT)
-
-endif
diff --git a/toolchain.mk b/toolchain.mk
new file mode 100644
index 0000000..8bf81fb
--- /dev/null
+++ b/toolchain.mk
@@ -0,0 +1,17 @@
+# Copyright (C) 2011 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(call all-makefiles-under, $(LOCAL_PATH))