From 00479a9fe04d577162712105855c4eb6d1a24ec9 Mon Sep 17 00:00:00 2001 From: Dmitriy Ivanov Date: Tue, 1 Apr 2014 16:36:21 -0700 Subject: [PATCH] Remove redundant my_target_global_ldflags * Fix: my_target_global_ldflags is defined in binary.mk so they effectivelly override previous definition Change-Id: I9c7d9bde82c3a6d25a94ae109fa71ecaa33640b0 --- core/executable_internal.mk | 5 ----- core/shared_library_internal.mk | 5 ----- 2 files changed, 10 deletions(-) diff --git a/core/executable_internal.mk b/core/executable_internal.mk index a1ce7f2ea..a7c3e86b2 100644 --- a/core/executable_internal.mk +++ b/core/executable_internal.mk @@ -28,11 +28,6 @@ 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) -ifeq ($(LOCAL_CLANG),true) -my_target_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_TARGET_GLOBAL_LDFLAGS) -else -my_target_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_LDFLAGS) -endif my_target_fdo_lib := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_FDO_LIB) my_target_libgcc := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LIBGCC) my_target_crtbegin_dynamic_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_CRTBEGIN_DYNAMIC_O) diff --git a/core/shared_library_internal.mk b/core/shared_library_internal.mk index 3090d3684..7f8a483f7 100644 --- a/core/shared_library_internal.mk +++ b/core/shared_library_internal.mk @@ -40,11 +40,6 @@ 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) -ifeq ($(LOCAL_CLANG),true) -my_target_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_TARGET_GLOBAL_LDFLAGS) -else -my_target_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_LDFLAGS) -endif my_target_fdo_lib := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_FDO_LIB) my_target_libgcc := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LIBGCC) my_target_crtbegin_so_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_CRTBEGIN_SO_O)