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/clear_vars.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/clear_vars.mk')
| -rw-r--r-- | core/clear_vars.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 59832eb..8692e73 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -164,6 +164,7 @@ LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN:= LOCAL_MODULE_HOST_ARCH:= LOCAL_NO_FPIE := LOCAL_CXX_STL := default +LOCAL_NATIVE_COVERAGE := # arch specific variables LOCAL_SRC_FILES_$(TARGET_ARCH):= |