diff options
| author | Ying Wang <wangying@google.com> | 2012-09-25 17:52:10 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2012-10-10 10:24:26 -0700 |
| commit | 57ddcb1bbce7a980e677dfd212ce76229fe33f55 (patch) | |
| tree | 81872ee17c18ca9b51b4e5639f32e5c66331a2b3 /core/definitions.mk | |
| parent | d73053a814260cb4a31a8a38727bbb6fc6f10946 (diff) | |
| download | build-57ddcb1bbce7a980e677dfd212ce76229fe33f55.zip build-57ddcb1bbce7a980e677dfd212ce76229fe33f55.tar.gz build-57ddcb1bbce7a980e677dfd212ce76229fe33f55.tar.bz2 | |
Support to build executables against the NDK
Use "LOCAL_SDK_VERSION := <number>" to build against the NDK when you
include $(BUILD_EXECUTABLE).
Cherry-picked from master.
Bug: 7170098
Change-Id: Ib35a294bd6aa4e969d46ecd8ebab8ca5d843e24b
Diffstat (limited to 'core/definitions.mk')
| -rw-r--r-- | core/definitions.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/definitions.mk b/core/definitions.mk index 5600779..7336c74 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -1259,13 +1259,11 @@ endef ifneq ($(TARGET_CUSTOM_LD_COMMAND),true) define transform-o-to-executable-inner $(hide) $(PRIVATE_CXX) \ - $(TARGET_GLOBAL_LDFLAGS) \ - -Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \ - $(TARGET_GLOBAL_LD_DIRS) \ + $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \ + $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ -Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \ -Wl,-rpath,\$$ORIGIN/../lib \ $(PRIVATE_LDFLAGS) \ - $(TARGET_GLOBAL_LD_DIRS) \ $(PRIVATE_ALL_OBJECTS) \ -Wl,--whole-archive \ $(call normalize-target-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \ |