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/shared_library.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/shared_library.mk')
| -rw-r--r-- | core/shared_library.mk | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/core/shared_library.mk b/core/shared_library.mk index a30d868..77d253f 100644 --- a/core/shared_library.mk +++ b/core/shared_library.mk @@ -26,7 +26,29 @@ OVERRIDE_BUILT_MODULE_PATH := $(TARGET_OUT_INTERMEDIATE_LIBRARIES) include $(BUILD_SYSTEM)/dynamic_binary.mk +# Define PRIVATE_ variables from global vars +my_target_global_ld_dirs := $(TARGET_GLOBAL_LD_DIRS) +my_target_global_ldflags := $(TARGET_GLOBAL_LDFLAGS) +my_target_fdo_lib := $(TARGET_FDO_LIB) +my_target_libgcc := $(TARGET_LIBGCC) +my_target_crtbegin_so_o := $(TARGET_CRTBEGIN_SO_O) +my_target_crtend_so_o := $(TARGET_CRTEND_SO_O) +ifdef LOCAL_NDK_VERSION +my_target_global_ld_dirs += -L$(my_ndk_version_root)/usr/lib +# The latest ndk does NOT support TARGET_CRTBEGIN_SO_O and TARGET_CRTEND_SO_O yet. +# my_target_crtbegin_so_o := $(my_ndk_version_root)/usr/lib/crtbegin_so.o +# my_target_crtend_so_o := $(my_ndk_version_root)/usr/lib/crtend_so.o +my_target_crtbegin_so_o := +my_target_crtend_so_o := +endif +$(linked_module): PRIVATE_TARGET_GLOBAL_LD_DIRS := $(my_target_global_ld_dirs) +$(linked_module): PRIVATE_TARGET_GLOBAL_LDFLAGS := $(my_target_global_ldflags) +$(linked_module): PRIVATE_TARGET_FDO_LIB := $(my_target_fdo_lib) +$(linked_module): PRIVATE_TARGET_LIBGCC := $(my_target_libgcc) +$(linked_module): PRIVATE_TARGET_CRTBEGIN_SO_O := $(my_target_crtbegin_so_o) +$(linked_module): PRIVATE_TARGET_CRTEND_SO_O := $(my_target_crtend_so_o) + $(linked_module): $(all_objects) $(all_libraries) \ $(LOCAL_ADDITIONAL_DEPENDENCIES) \ - $(TARGET_CRTBEGIN_SO_O) $(TARGET_CRTEND_SO_O) + $(my_target_crtbegin_so_o) $(my_target_crtend_so_o) $(transform-o-to-shared-lib) |