mdw@git.distorted.org.uk Git - termux-packages/blob - packages/aapt/libziparchive.patch.txt

   1 Remove reference to __android_log_error_write which does not exist
   2 on Android 5. See:
   3
   4   https://github.com/termux/termux-packages/issues/1306
   5
   6 diff -u -r ../../pristine-src/libziparchive/zip_archive.cc ./zip_archive.cc
   7 --- ../../pristine-src/libziparchive/zip_archive.cc     2017-08-23 21:25:26.492287975 +0200
   8 +++ ./zip_archive.cc    2017-08-23 21:31:15.904280978 +0200
   9 @@ -272,11 +272,6 @@
  10    if (static_cast<off64_t>(eocd->cd_start_offset) + eocd->cd_size > eocd_offset) {
  11      ALOGW("Zip: bad offsets (dir %" PRIu32 ", size %" PRIu32 ", eocd %" PRId64 ")",
  12          eocd->cd_start_offset, eocd->cd_size, static_cast<int64_t>(eocd_offset));
  13 -#if defined(__ANDROID__)
  14 -    if (eocd->cd_start_offset + eocd->cd_size <= eocd_offset) {
  15 -      android_errorWriteLog(0x534e4554, "31251826");
  16 -    }
  17 -#endif
  18      return kInvalidOffset;
  19    }
  20    if (eocd->num_records == 0) {
  21 @@ -388,9 +383,6 @@
  22    for (uint16_t i = 0; i < num_entries; i++) {
  23      if (ptr > cd_end - sizeof(CentralDirectoryRecord)) {
  24        ALOGW("Zip: ran off the end (at %" PRIu16 ")", i);
  25 -#if defined(__ANDROID__)
  26 -      android_errorWriteLog(0x534e4554, "36392138");
  27 -#endif
  28        return -1;
  29      }
  30