Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebd1e252 authored by David 'Digit' Turner's avatar David 'Digit' Turner Committed by David 'Digit' Turner
Browse files

core/binary.mk: Add missing Objective-C objects to the build. DO NOT MERGE 

NOTE: This is a back-port from AOSP into the internal gingerbread branch.

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: I03e179f3216ed95908bf8e8011d34109accff1b9
Orig-Change-Id: I173811cf11cdb5b045073aade59364236145bc77
parent 0cc5e1ef

core/binary.mk

+1 −0
Original line number Diff line number Diff line
@@ -337,6 +337,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))

core/definitions.mk

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