diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-02-09 16:01:53 +0100 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2011-02-09 16:07:39 +0100 |
| commit | ba313e080f0be3061b458075e8e66fc5ff700e3c (patch) | |
| tree | d48e79485c37ce4d526f0f810d1f1d614b50be24 /android/build/binary.make | |
| parent | c6375cb970388a3d4f691350fecdfd528eb334df (diff) | |
| download | external_qemu-ba313e080f0be3061b458075e8e66fc5ff700e3c.zip external_qemu-ba313e080f0be3061b458075e8e66fc5ff700e3c.tar.gz external_qemu-ba313e080f0be3061b458075e8e66fc5ff700e3c.tar.bz2 | |
android-configure.sh: Fix --cc=<compiler> option.
+ Fix LOCAL_GENERATED_SOURCES handling
+ Fix missing library dependencies for executables
+ Move generated library files to objs/libs/ (instead of objs/)
Change-Id: If3ebaa7ae856efa9bd3ff9e2c199389989db7f71
Diffstat (limited to 'android/build/binary.make')
| -rw-r--r-- | android/build/binary.make | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/android/build/binary.make b/android/build/binary.make index e22a96d..f6542dc 100644 --- a/android/build/binary.make +++ b/android/build/binary.make @@ -20,7 +20,8 @@ LOCAL_OBJS_DIR := $(call intermediates-dir-for,EXECUTABLES,$(LOCAL_MODULE)) LOCAL_OBJECTS := LOCAL_CC ?= $(CC) -LOCAL_C_SOURCES := $(filter %.c,$(LOCAL_SRC_FILES) $(LOCAL_GENERATED_SOURCES)) +LOCAL_C_SOURCES := $(filter %.c,$(LOCAL_SRC_FILES)) +LOCAL_GENERATED_C_SOURCES := $(filter %.c,$(LOCAL_GENERATED_SOURCES)) LOCAL_CXX_SOURCES := $(filter %$(LOCAL_CPP_EXTENSION),$(LOCAL_SRC_FILES) $(LOCAL_GENERATED_SOURCES)) LOCAL_OBJC_SOURCES := $(filter %.m,$(LOCAL_SRC_FILES) $(LOCAL_GENERATED_SOURCES)) @@ -28,6 +29,10 @@ $(foreach src,$(LOCAL_C_SOURCES), \ $(eval $(call compile-c-source,$(src))) \ ) +$(foreach src,$(LOCAL_GENERATED_C_SOURCES), \ + $(eval $(call compile-generated-c-source,$(src))) \ +) + $(foreach src,$(LOCAL_CXX_SOURCES), \ $(eval $(call compile-cxx-source,$(src))) \ ) |