diff options
| author | David Turner <digit@google.com> | 2011-09-29 20:17:38 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-29 20:17:38 -0700 |
| commit | 719051f9878f85b57470d9047e8156320f31c98a (patch) | |
| tree | 0b7e2dd8e639f231ebb4daf6bb7b4f66d52e3524 | |
| parent | 013607f97c0d3b96eb6292c85aae89ffc86a3a06 (diff) | |
| parent | ebd1e25272de54b4b874a24c7740a6e30b1f38eb (diff) | |
| download | build-719051f9878f85b57470d9047e8156320f31c98a.tar.gz | |
Merge "core/binary.mk: Add missing Objective-C objects to the build. DO NOT MERGE" into gingerbreadandroid-cts-2.3_r10
| -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 5fb0e7532d..51207063e0 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -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)) diff --git a/core/definitions.mk b/core/definitions.mk index cd50f62d83..9cc7038820 100644 --- 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 |