Commit 5ca286d5 authored Feb 11, 2011 by David 'Digit' Turner

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

parent 6b7b53cb

core/binary.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -388,6 +388,7 @@ all_objects := \
		$(gen_asm_objects) \
		$(c_objects) \
		$(gen_c_objects) \
		$(objc_objects) \
		$(yacc_objects) \
		$(lex_objects) \
		$(proto_generated_objects) \

core/definitions.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -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