diff options
| author | Ying Wang <wangying@google.com> | 2012-09-25 17:52:10 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2012-09-25 18:33:53 -0700 |
| commit | c6ffc00b9fa7898564139558a025d865bac37a38 (patch) | |
| tree | 447450c30d849d1ef911c5b882b73e845894ca8a /core/executable.mk | |
| parent | b301817223d7163de6827976f8259363ab18c7b8 (diff) | |
| download | build-c6ffc00b9fa7898564139558a025d865bac37a38.zip build-c6ffc00b9fa7898564139558a025d865bac37a38.tar.gz build-c6ffc00b9fa7898564139558a025d865bac37a38.tar.bz2 | |
Support to build executables against the NDK
Use "LOCAL_SDK_VERSION := <number>" to build against the NDK when you
include $(BUILD_EXECUTABLE).
Bug: 7170098
Change-Id: I4cebeae3355e79a4d2f2f5549ef0613ced77e3f0
Diffstat (limited to 'core/executable.mk')
| -rw-r--r-- | core/executable.mk | 34 |
1 files changed, 31 insertions, 3 deletions
diff --git a/core/executable.mk b/core/executable.mk index baebc3b..d6f383b 100644 --- a/core/executable.mk +++ b/core/executable.mk @@ -26,10 +26,38 @@ endif 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_dynamic_o := $(TARGET_CRTBEGIN_DYNAMIC_O) +my_target_crtbegin_static_o := $(TARGET_CRTBEGIN_STATIC_O) +my_target_crtend_o := $(TARGET_CRTEND_O) +ifdef LOCAL_SDK_VERSION +# Make sure the prebuilt NDK paths are put ahead of the TARGET_GLOBAL_LD_DIRS, +# so we don't have race condition when the system libraries (such as libc, libstdc++) are also built in the tree. +my_target_global_ld_dirs := \ + $(addprefix -L, $(patsubst %/,%,$(dir $(my_ndk_stl_shared_lib_fullpath))) \ + $(my_ndk_version_root)/usr/lib) \ + $(my_target_global_ld_dirs) +my_target_global_ldflags := $(my_ndk_stl_shared_lib) $(my_target_global_ldflags) +my_target_crtbegin_dynamic_o := $(wildcard $(my_ndk_version_root)/usr/lib/crtbegin_dynamic.o) +my_target_crtbegin_static_o := $(wildcard $(my_ndk_version_root)/usr/lib/crtbegin_static.o) +my_target_crtend_o := $(wildcard $(my_ndk_version_root)/usr/lib/crtend_android.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_DYNAMIC_O := $(my_target_crtbegin_dynamic_o) +$(linked_module): PRIVATE_TARGET_CRTBEGIN_STATIC_O := $(my_target_crtbegin_static_o) +$(linked_module): PRIVATE_TARGET_CRTEND_O := $(my_target_crtend_o) + ifeq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true) -$(linked_module): $(TARGET_CRTBEGIN_STATIC_O) $(all_objects) $(all_libraries) $(TARGET_CRTEND_O) +$(linked_module): $(my_target_crtbegin_static_o) $(all_objects) $(all_libraries) $(my_target_crtend_o) $(transform-o-to-static-executable) -else -$(linked_module): $(TARGET_CRTBEGIN_DYNAMIC_O) $(all_objects) $(all_libraries) $(TARGET_CRTEND_O) +else +$(linked_module): $(my_target_crtbegin_dynamic_o) $(all_objects) $(all_libraries) $(my_target_crtend_o) $(transform-o-to-executable) endif |