summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2012-01-06 12:11:38 -0800
committerYing Wang <wangying@google.com>2012-01-06 12:11:38 -0800
commit1cbbd66bb7a33b94756da36c97083988357021a7 (patch)
tree0b0786b1647e2729d1027daaef5952ab968f96af
parent8d2f0428705d03c3ecf5af9ba13f2259b11020c6 (diff)
downloadarm-linux-androideabi-4.6-1cbbd66bb7a33b94756da36c97083988357021a7.tar.gz
Add toolchain.mk that will get included in the build project.
Change-Id: I5fec3f7d61de805262929db190acddef462401b5
-rw-r--r--lib/Android.mk4
-rw-r--r--toolchain.mk17
2 files changed, 17 insertions, 4 deletions
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_PREBUILT_LIBS := \
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))