diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-02-11 16:19:31 +0100 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2011-02-11 17:52:52 +0100 |
| commit | 5ca286d58bc2f8e2445ae77d7ca8b4046a016988 (patch) | |
| tree | 104395553d3597484629eede7759444a2ccf2bbe | |
| parent | 6b7b53cb36bda3b2aa1de94654cd73785d67c267 (diff) | |
| download | build-5ca286d58bc2f8e2445ae77d7ca8b4046a016988.zip build-5ca286d58bc2f8e2445ae77d7ca8b4046a016988.tar.gz build-5ca286d58bc2f8e2445ae77d7ca8b4046a016988.tar.bz2 | |
core/binary.mk: Add missing Objective-C objects to the build.
For some reason, all_objects was not listing objects generated from
objective-C sources. We need these for the emulator (which builds its
own version of SDL which uses Quartz on OS X).
+ Fix a typo in transform-host-m-to-o definition.
This also explains why https://review.source.android.com/#change,21074
had to be reverted, since it gets rid of the prebuilt SDL libraries when
building the emulator.
Change-Id: I173811cf11cdb5b045073aade59364236145bc77
| -rw-r--r-- | core/binary.mk | 1 | ||||
| -rw-r--r-- | core/definitions.mk | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/binary.mk b/core/binary.mk index 88c356a..b9e884e 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -388,6 +388,7 @@ all_objects := \ $(gen_asm_objects) \ $(c_objects) \ $(gen_c_objects) \ + $(objc_objects) \ $(yacc_objects) \ $(lex_objects) \ $(proto_generated_objects) \ diff --git a/core/definitions.mk b/core/definitions.mk index 36285b8..9112af6 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -970,7 +970,7 @@ define transform-host-m-to-o-no-deps $(call transform-host-c-or-s-to-o-no-deps) endef -define tranform-host-m-to-o +define transform-host-m-to-o $(transform-host-m-to-o-no-deps) $(transform-d-to-p) endef |