diff options
| author | Ying Wang <wangying@google.com> | 2014-11-18 16:28:04 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-11-18 16:28:04 -0800 |
| commit | 0217e3b20b6a331b0820014dc136d782070bca45 (patch) | |
| tree | 6d85f6ebd5d5ca510c89e7e2f7cdc723e2a50c44 /core/clear_vars.mk | |
| parent | 9a186a1c6dd501b1808fd3ab79317de5dec0669f (diff) | |
| parent | a4f415d65ea3bbf375b8b82a7ce5086612914679 (diff) | |
| download | build-0217e3b20b6a331b0820014dc136d782070bca45.zip build-0217e3b20b6a331b0820014dc136d782070bca45.tar.gz build-0217e3b20b6a331b0820014dc136d782070bca45.tar.bz2 | |
resolved conflicts for merge of a4f415d6 to lmp-mr1-dev-plus-aosp
Change-Id: Ibb54bce20342bd386ec85388d48c1c08e8b80197
Diffstat (limited to 'core/clear_vars.mk')
| -rw-r--r-- | core/clear_vars.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 87adbb1..f3f4ce9 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -167,6 +167,8 @@ LOCAL_MODULE_HOST_ARCH:= LOCAL_NO_FPIE := LOCAL_CXX_STL := default LOCAL_NATIVE_COVERAGE := +LOCAL_DPI_VARIANTS:= +LOCAL_DPI_FILE_STEM:= # arch specific variables LOCAL_SRC_FILES_$(TARGET_ARCH):= |