aboutsummaryrefslogtreecommitdiffstats
path: root/android/build/host_static_library.make
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@android.com>2011-03-02 12:49:26 +0100
committerDavid 'Digit' Turner <digit@android.com>2011-03-02 15:12:49 +0100
commit0a349b838d5106d0f1f39ae77792d4bdd7f8d35f (patch)
treeccae3a22e1dc1bd835760ae447157494dc43f8c7 /android/build/host_static_library.make
parentd0986186d4d5ff176a26d941bb53d3856d28304a (diff)
downloadexternal_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
Diffstat (limited to 'android/build/host_static_library.make')
-rw-r--r--android/build/host_static_library.make5
1 files changed, 4 insertions, 1 deletions
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)