diff options
| author | Ying Wang <wangying@google.com> | 2012-01-06 12:13:45 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2012-01-06 12:13:45 -0800 |
| commit | bbbbf0732195487b3506479e8943f6d5df6f8db6 (patch) | |
| tree | 019128a379fc51ad9ac3bdb14cc8818a49e5d86a | |
| parent | 60d2424035ee5c1c2c5c3e1a65b2f4e9b70bd91b (diff) | |
| download | arm-linux-androideabi-4.6-bbbbf0732195487b3506479e8943f6d5df6f8db6.tar.gz | |
Add toolchain.mk that will get included in the build project.
Change-Id: Ib1e534586ff9d3b968d3ae88a2144b70d7fe583a
| -rw-r--r-- | lib/Android.mk | 4 | ||||
| -rw-r--r-- | toolchain.mk | 17 |
2 files changed, 17 insertions, 4 deletions
diff --git a/lib/Android.mk b/lib/Android.mk index 6453959..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),darwin-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)) |