diff options
| author | Ying Wang <wangying@google.com> | 2010-07-13 17:24:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-13 17:24:09 -0700 |
| commit | 90cf34c72e204eb1d23f43d1fccbf2076e8ff67b (patch) | |
| tree | ec70f242d3c8207ac5abb5d76c33ab53315322fb /core/combo/TARGET_linux-x86.mk | |
| parent | 1778b4b11effa15b3b540a5153f68127a9ec6adb (diff) | |
| parent | f0f60cdd8f4f74b2480774887606afdebec8d891 (diff) | |
| download | build-90cf34c72e204eb1d23f43d1fccbf2076e8ff67b.zip build-90cf34c72e204eb1d23f43d1fccbf2076e8ff67b.tar.gz build-90cf34c72e204eb1d23f43d1fccbf2076e8ff67b.tar.bz2 | |
am f0f60cdd: resolved conflicts for merge of 1a08100f to gingerbread
Merge commit 'f0f60cdd8f4f74b2480774887606afdebec8d891' into gingerbread-plus-aosp
* commit 'f0f60cdd8f4f74b2480774887606afdebec8d891':
Support to build native libraries with prebuilt NDK
Diffstat (limited to 'core/combo/TARGET_linux-x86.mk')
| -rw-r--r-- | core/combo/TARGET_linux-x86.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index 6d123d0..17c5ec3 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -106,12 +106,12 @@ TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libstdc++ libm TARGET_CUSTOM_LD_COMMAND := true define transform-o-to-shared-lib-inner $(TARGET_CXX) \ - $(TARGET_GLOBAL_LDFLAGS) \ + $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \ -nostdlib -Wl,-soname,$(notdir $@) \ -shared -Bsymbolic \ -fPIC -march=i686 \ - $(TARGET_GLOBAL_LD_DIRS) \ - $(TARGET_CRTBEGIN_SO_O) \ + $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ + $(PRIVATE_TARGET_CRTBEGIN_SO_O) \ $(PRIVATE_ALL_OBJECTS) \ -Wl,--whole-archive \ $(call normalize-host-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \ @@ -120,8 +120,8 @@ $(TARGET_CXX) \ $(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \ -o $@ \ $(PRIVATE_LDFLAGS) \ - $(TARGET_LIBGCC) \ - $(TARGET_CRTEND_SO_O) + $(PRIVATE_TARGET_LIBGCC) \ + $(PRIVATE_TARGET_CRTEND_SO_O) endef |