diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-03-02 00:51:35 -0800 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-03-02 00:51:35 -0800 |
| commit | c6ff088012be99c37747ee7ae500b4aab10b6934 (patch) | |
| tree | a18e2457ae7937085f826cc273ce7b0a3abd9a81 | |
| parent | 68a65132248c244003b820e9ae7c60cda336ba45 (diff) | |
| parent | b580d2607b12b893745276c3068d9d09920608dc (diff) | |
| download | external_qemu-c6ff088012be99c37747ee7ae500b4aab10b6934.zip external_qemu-c6ff088012be99c37747ee7ae500b4aab10b6934.tar.gz external_qemu-c6ff088012be99c37747ee7ae500b4aab10b6934.tar.bz2 | |
Merge "Avoid redefining HOST_CC/CXX when building the emulator."
| -rw-r--r-- | Makefile.android | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.android b/Makefile.android index 095524a..428b63a 100644 --- a/Makefile.android +++ b/Makefile.android @@ -95,10 +95,9 @@ ifneq ($(BUILD_STANDALONE_EMULATOR),true) HOST_SDK_TOOLCHAIN_PREFIX := prebuilt/linux-x86/toolchain/i686-linux-glibc2.7-4.4.3/bin/i686-linux # Don't do anything if the toolchain is not there ifneq (,$(strip $(wildcard $(HOST_SDK_TOOLCHAIN_PREFIX)-gcc))) - HOST_CC := $(HOST_SDK_TOOLCHAIN_PREFIX)-gcc - HOST_CXX := $(HOST_SDK_TOOLCHAIN_PREFIX)-g++ - HOST_AR := $(HOST_SDK_TOOLCHAIN_PREFIX)-ar - MY_CC := $(HOST_CC) + MY_CC := $(HOST_SDK_TOOLCHAIN_PREFIX)-gcc + MY_CXX := $(HOST_SDK_TOOLCHAIN_PREFIX)-g++ + MY_AR := $(HOST_SDK_TOOLCHAIN_PREFIX)-ar endif # $(HOST_SDK_TOOLCHAIN_PREFIX)-gcc exists endif # HOST_OS == linux @@ -141,7 +140,9 @@ start-emulator-library = \ $(eval include $(CLEAR_VARS)) \ $(eval LOCAL_NO_DEFAULT_COMPILER_FLAGS := true) \ $(eval LOCAL_CC := $(MY_CC)) \ + $(eval LOCAL_CXX := $(MY_CXX)) \ $(eval LOCAL_CFLAGS := $(MY_CFLAGS)) \ + $(eval LOCAL_AR := $(MY_AR)) \ $(eval LOCAL_LDLIBS := $(MY_LDLIBS)) \ $(eval LOCAL_MODULE_TAGS := debug) \ $(eval LOCAL_MODULE := $1) |