diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-03-02 12:49:26 +0100 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2011-03-02 15:12:49 +0100 |
| commit | 0a349b838d5106d0f1f39ae77792d4bdd7f8d35f (patch) | |
| tree | ccae3a22e1dc1bd835760ae447157494dc43f8c7 | |
| parent | d0986186d4d5ff176a26d941bb53d3856d28304a (diff) | |
| download | external_qemu-0a349b838d5106d0f1f39ae77792d4bdd7f8d35f.zip external_qemu-0a349b838d5106d0f1f39ae77792d4bdd7f8d35f.tar.gz external_qemu-0a349b838d5106d0f1f39ae77792d4bdd7f8d35f.tar.bz2 | |
Fix the standalone emulator build.
The previous commit broke it due to the way it handled LOCAL_AR.
Change-Id: I3458f9306b3fca9771d868673ae89f4d995aeec3
| -rw-r--r-- | Makefile.android | 4 | ||||
| -rw-r--r-- | android/build/clear_vars.make | 1 | ||||
| -rw-r--r-- | android/build/host_static_library.make | 5 |
3 files changed, 8 insertions, 2 deletions
diff --git a/Makefile.android b/Makefile.android index 428b63a..dd05398 100644 --- a/Makefile.android +++ b/Makefile.android @@ -25,7 +25,9 @@ endif CONFIG_INCLUDES := $(CONFIG_DIRS:%=-I%) -MY_CC := $(HOST_CC) +MY_CC := $(HOST_CC) +MY_CXX := $(HOST_CXX) +MY_AR := $(HOST_AR) MY_OPTIM := -O2 -g -fno-PIC -falign-functions=0 -fomit-frame-pointer ifeq ($(BUILD_DEBUG_EMULATOR),true) diff --git a/android/build/clear_vars.make b/android/build/clear_vars.make index f4ca9b7..5cdce07 100644 --- a/android/build/clear_vars.make +++ b/android/build/clear_vars.make @@ -18,6 +18,7 @@ LOCAL_NO_DEFAULT_COMPILER_FLAGS:= LOCAL_CC := LOCAL_CXX := +LOCAL_AR := LOCAL_CFLAGS := LOCAL_LDFLAGS := LOCAL_LDLIBS := diff --git a/android/build/host_static_library.make b/android/build/host_static_library.make index 3de5a99..38ff625 100644 --- a/android/build/host_static_library.make +++ b/android/build/host_static_library.make @@ -22,7 +22,10 @@ LOCAL_BUILT_MODULE := $(call library-path,$(LOCAL_MODULE)) LOCAL_CC ?= $(CC) include $(BUILD_SYSTEM)/binary.make -LOCAL_AR ?= $(AR) +LOCAL_AR := $(strip $(LOCAL_AR)) +ifndef LOCAL_AR + LOCAL_AR := $(AR) +endif ARFLAGS := crs $(LOCAL_BUILT_MODULE): PRIVATE_AR := $(LOCAL_AR) |