aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2021-04-07 19:49:47 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-07 19:49:47 +0000
commitd63e28da1fa6d8de00a9f3ae539778667017f11a (patch)
treecbca4ba9a38436e45fc93a2d3a3a5833016b94f3
parentdd6969c82e19edca3663c04f1b471f5ddc09ae9d (diff)
parent1f2bdec49f87aead511cc62ee02dfc34937d46da (diff)
downloadlibjpeg-turbo-d63e28da1fa6d8de00a9f3ae539778667017f11a.tar.gz
Revert "Upgrade libjpeg-turbo to 7b4981b6500ccba10733c352b9ed2dad14ce3c73" am: c913ecddcc am: bc377bb56e am: 1f2bdec49f
Original change: https://android-review.googlesource.com/c/platform/external/libjpeg-turbo/+/1665307 Change-Id: Icf2159c687bfad1d240c6b6525878c25966a868e
-rw-r--r--METADATA6
-rw-r--r--jpeglib.h4
2 files changed, 3 insertions, 7 deletions
diff --git a/METADATA b/METADATA
index d9c3aeee..4ad1e69f 100644
--- a/METADATA
+++ b/METADATA
@@ -5,11 +5,11 @@ third_party {
type: GIT
value: "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo"
}
- version: "7b4981b6500ccba10733c352b9ed2dad14ce3c73"
+ version: "07a7d24ba3c91fa695d4f2b65f0788c0c80c7928"
license_type: NOTICE
last_upgrade_date {
year: 2021
- month: 4
- day: 1
+ month: 2
+ day: 9
}
}
diff --git a/jpeglib.h b/jpeglib.h
index 979ef7c8..d7664f06 100644
--- a/jpeglib.h
+++ b/jpeglib.h
@@ -18,10 +18,6 @@
#ifndef JPEGLIB_H
#define JPEGLIB_H
-/* Begin chromium edits */
-#include "jpeglibmangler.h"
-/* End chromium edits */
-
/*
* First we include the configuration files that record how this
* installation of the JPEG library is set up. jconfig.h can be