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

diff --git a/core/binary.mk b/core/binary.mk
index 3358544..55bc399 100644 (file)
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -344,6 +344,7 @@ all_objects := \
        $(gen_asm_objects) \
        $(c_objects) \
        $(gen_c_objects) \
+       $(objc_objects) \
        $(yacc_objects) \
        $(lex_objects) \
        $(addprefix $(TOPDIR)$(LOCAL_PATH)/,$(LOCAL_PREBUILT_OBJ_FILES))

diff --git a/core/definitions.mk b/core/definitions.mk
index f5a3c8a..91ed91f 100644 (file)
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -927,7 +927,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