Merge "Fix libgcov.a dependency" am: f9d5fb97cb am: 4b9f214a7b

am: 64deaba889

Change-Id: I3648ae9652438dddde23afb7bd6392751bbae442
This commit is contained in:
Dan Willemsen
2016-09-12 19:23:13 +00:00
committed by android-build-merger

View File

@@ -537,9 +537,6 @@ ifeq ($(NATIVE_COVERAGE),true)
my_cflags += --coverage -O0 my_cflags += --coverage -O0
my_ldflags += --coverage my_ldflags += --coverage
endif endif
else
my_native_coverage := false
endif
ifeq ($(my_clang),true) ifeq ($(my_clang),true)
my_coverage_lib := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)LIBPROFILE_RT) my_coverage_lib := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)LIBPROFILE_RT)
@@ -548,6 +545,10 @@ else
endif endif
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_COVERAGE_LIB := $(my_coverage_lib) $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_COVERAGE_LIB := $(my_coverage_lib)
$(LOCAL_INTERMEDIATE_TARGETS): $(my_coverage_lib)
else
my_native_coverage := false
endif
########################################################### ###########################################################
## Define PRIVATE_ variables used by multiple module types ## Define PRIVATE_ variables used by multiple module types