diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-24 09:42:39 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-09-24 09:42:39 -0700 |
| commit | 7655a979846db6be2df803d76ec6602cea3f738e (patch) | |
| tree | ed59aa8cfed33edecedc2addce513bb529f4e138 /core/shared_library_internal.mk | |
| parent | f811b82b4d28bddde54c42b8771df47b5ee520b7 (diff) | |
| parent | 326f9450f03d24d49e77697547c3373370e7eb2b (diff) | |
| download | build-7655a979846db6be2df803d76ec6602cea3f738e.zip build-7655a979846db6be2df803d76ec6602cea3f738e.tar.gz build-7655a979846db6be2df803d76ec6602cea3f738e.tar.bz2 | |
resolved conflicts for merge of 326f9450 to lmp-dev-plus-aosp
Change-Id: I66360da623a6e7ac04610c3252f24ed69f7e4b1e
Diffstat (limited to 'core/shared_library_internal.mk')
| -rw-r--r-- | core/shared_library_internal.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/shared_library_internal.mk b/core/shared_library_internal.mk index c01be37..baedb3b 100644 --- a/core/shared_library_internal.mk +++ b/core/shared_library_internal.mk @@ -40,6 +40,7 @@ include $(BUILD_SYSTEM)/dynamic_binary.mk # Define PRIVATE_ variables from global vars my_target_global_ld_dirs := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_LD_DIRS) +my_target_libgcov := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LIBGCOV) my_target_libgcc := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LIBGCC) my_target_libatomic := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LIBATOMIC) my_target_crtbegin_so_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_CRTBEGIN_SO_O) @@ -57,6 +58,7 @@ my_target_crtend_so_o := $(wildcard $(my_ndk_sysroot_lib)/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_LIBGCOV := $(my_target_libgcov) $(linked_module): PRIVATE_TARGET_LIBGCC := $(my_target_libgcc) $(linked_module): PRIVATE_TARGET_LIBATOMIC := $(my_target_libatomic) $(linked_module): PRIVATE_TARGET_CRTBEGIN_SO_O := $(my_target_crtbegin_so_o) |