diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2015-04-20 14:08:43 -0700 |
|---|---|---|
| committer | Dmitriy Ivanov <dimitry@google.com> | 2015-04-20 14:08:43 -0700 |
| commit | 594c0868d42b11e21d77dbdafa571d582b99305a (patch) | |
| tree | 046a1f2ecba2bd2f80cf3cf2bb51d12747c26d17 /core/clear_vars.mk | |
| parent | 12753112f3e67c667c97078971d3538ef4fcdda7 (diff) | |
| parent | 6cb3732d82e6a2346c00219931d0f0a3c3257f44 (diff) | |
| download | build-594c0868d42b11e21d77dbdafa571d582b99305a.zip build-594c0868d42b11e21d77dbdafa571d582b99305a.tar.gz build-594c0868d42b11e21d77dbdafa571d582b99305a.tar.bz2 | |
resolved conflicts for merge of 6cb3732d to master
Change-Id: I6415638ccde1e78f74ae5d9527dc696d40f15e5f
Diffstat (limited to 'core/clear_vars.mk')
| -rw-r--r-- | core/clear_vars.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index fd117a5..6bdc113 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -93,7 +93,6 @@ LOCAL_COPY_HEADERS_TO:= LOCAL_COPY_HEADERS:= LOCAL_FORCE_STATIC_EXECUTABLE:= LOCAL_ADDITIONAL_DEPENDENCIES:= -LOCAL_COMPRESS_MODULE_SYMBOLS:= LOCAL_STRIP_MODULE:= LOCAL_JNI_SHARED_LIBRARIES:= LOCAL_JNI_SHARED_LIBRARIES_ABI:= |