aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2021-04-08 01:03:14 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2021-04-08 01:03:14 +0000
commit3da1eec86e9e303648a3f673f2903b34c688c9d9 (patch)
treecbca4ba9a38436e45fc93a2d3a3a5833016b94f3
parent270a2033152a30a460c27dc6fa4220fe72fadde2 (diff)
parentd63e28da1fa6d8de00a9f3ae539778667017f11a (diff)
downloadlibjpeg-turbo-3da1eec86e9e303648a3f673f2903b34c688c9d9.tar.gz
Snap for 7266202 from d63e28da1fa6d8de00a9f3ae539778667017f11a to sc-d1-release
Change-Id: I2310c3e95f50ae2898f06d87219b5c1452c1c04f
-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