diff options
| author | Elliott Hughes <enh@google.com> | 2014-12-08 17:09:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-08 17:09:07 +0000 |
| commit | 5457de7beec0dcfd8085f7252ac2efa03c2de8d0 (patch) | |
| tree | 3d12ae8f4d7cd6091dfb65307b3d9228f736df01 | |
| parent | c725e6c0486df74ad323f5c580e6dedceaf47740 (diff) | |
| parent | 5f342355b7ee941cf12756d668a46cccfbd1c655 (diff) | |
| download | srec-5457de7beec0dcfd8085f7252ac2efa03c2de8d0.tar.gz | |
Merge "Use libz instead of libunz"
| -rw-r--r-- | srec/ca/Android.mk | 2 | ||||
| -rw-r--r-- | srec_jni/Android.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/srec/ca/Android.mk b/srec/ca/Android.mk index 38e3fd9..069ff3b 100644 --- a/srec/ca/Android.mk +++ b/srec/ca/Android.mk @@ -84,7 +84,7 @@ common_SHARED_LIBRARIES := \ common_STATIC_LIBRARIES := \ libzipfile \ - libunz \ + libz \ common_TARGET:= libSR_Core diff --git a/srec_jni/Android.mk b/srec_jni/Android.mk index c14091c..974c6b4 100644 --- a/srec_jni/Android.mk +++ b/srec_jni/Android.mk @@ -48,7 +48,7 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \ libzipfile \ - libunz \ + libz \ LOCAL_WHOLE_STATIC_LIBRARIES := \ libESR_Shared \ |