diff options
| author | Ying Wang <wangying@google.com> | 2010-07-13 14:55:47 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2010-07-13 16:29:18 -0700 |
| commit | 1a08100fa9d92c25de32ba4d13fd3958bbcab894 (patch) | |
| tree | d8a3a8d4594485b4b39e5e195a2e111e58c955b2 /core/definitions.mk | |
| parent | b66a5c0574e14b838d9dc2497540ffc6cb73dc4f (diff) | |
| download | build-1a08100fa9d92c25de32ba4d13fd3958bbcab894.zip build-1a08100fa9d92c25de32ba4d13fd3958bbcab894.tar.gz build-1a08100fa9d92c25de32ba4d13fd3958bbcab894.tar.bz2 | |
Support to build native libraries with prebuilt NDK
Bug: http://b/issue?id=2811253
Change-Id: Iabd4ab8b3d7236dffe89f1939e1142e882944026
Diffstat (limited to 'core/definitions.mk')
| -rw-r--r-- | core/definitions.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/core/definitions.mk b/core/definitions.mk index c6d855d..0faef02 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -767,16 +767,16 @@ $(hide) $(PRIVATE_CXX) \ $(foreach incdir, \ $(PRIVATE_C_INCLUDES) \ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ - $(TARGET_PROJECT_INCLUDES) \ - $(TARGET_C_INCLUDES) \ + $(PRIVATE_TARGET_PROJECT_INCLUDES) \ + $(PRIVATE_TARGET_C_INCLUDES) \ ) \ , \ -I $(incdir) \ ) \ -c \ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ - $(TARGET_GLOBAL_CFLAGS) \ - $(TARGET_GLOBAL_CPPFLAGS) \ + $(PRIVATE_TARGET_GLOBAL_CFLAGS) \ + $(PRIVATE_TARGET_GLOBAL_CPPFLAGS) \ $(PRIVATE_ARM_CFLAGS) \ ) \ -fno-rtti \ @@ -799,15 +799,15 @@ $(hide) $(PRIVATE_CC) \ $(foreach incdir, \ $(PRIVATE_C_INCLUDES) \ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ - $(TARGET_PROJECT_INCLUDES) \ - $(TARGET_C_INCLUDES) \ + $(PRIVATE_TARGET_PROJECT_INCLUDES) \ + $(PRIVATE_TARGET_C_INCLUDES) \ ) \ , \ -I $(incdir) \ ) \ -c \ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ - $(TARGET_GLOBAL_CFLAGS) \ + $(PRIVATE_TARGET_GLOBAL_CFLAGS) \ $(PRIVATE_ARM_CFLAGS) \ ) \ $(PRIVATE_CFLAGS) \ @@ -1062,12 +1062,12 @@ endef ifneq ($(TARGET_CUSTOM_LD_COMMAND),true) define transform-o-to-shared-lib-inner $(TARGET_CXX) \ - $(TARGET_GLOBAL_LDFLAGS) \ + $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \ -Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \ -Wl,-rpath,\$$ORIGIN/../lib \ -shared -Wl,-soname,$(notdir $@) \ $(PRIVATE_LDFLAGS) \ - $(TARGET_GLOBAL_LD_DIRS) \ + $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ $(PRIVATE_ALL_OBJECTS) \ -Wl,--whole-archive \ $(call normalize-host-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \ |