diff options
| author | Adenilson Cavalcanti <adenilson.cavalcanti@arm.com> | 2020-05-26 20:39:26 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-05-26 20:39:26 +0000 |
| commit | f5eca0dc9b4525e975a5e862633ab38a06dc11b4 (patch) | |
| tree | c3b04ba57b31dfe2f6c37f0315c0cdaa24361bd2 /google | |
| parent | 9444fdb7d9f9e33e5c948aae6a84df66643f7100 (diff) | |
| download | zlib-f5eca0dc9b4525e975a5e862633ab38a06dc11b4.tar.gz | |
[zlib] Using relative header paths on unit tests
The idea is to allow building the utests outside of Chromium directory
structure, thus allowing to run the tests as part of AOSP or any other
downstream project.
Bug: 1032721
Change-Id: I21a93b35221a9f5438c8a50908af05725c28022a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2210904
Reviewed-by: Chris Blume <cblume@chromium.org>
Commit-Queue: Adenilson Cavalcanti <cavalcantii@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#771939}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 944295e224eb626ffbc52fd533554c99fce363f3
Diffstat (limited to 'google')
| -rw-r--r-- | google/DEPS | 1 | ||||
| -rw-r--r-- | google/compression_utils_portable.cc | 2 | ||||
| -rw-r--r-- | google/compression_utils_portable.h | 5 |
3 files changed, 6 insertions, 2 deletions
diff --git a/google/DEPS b/google/DEPS index 144fbd1..03f2cb9 100644 --- a/google/DEPS +++ b/google/DEPS @@ -2,4 +2,5 @@ include_rules = [ '+base', '+build', '+testing', + "+third_party/zlib/zlib.h", ] diff --git a/google/compression_utils_portable.cc b/google/compression_utils_portable.cc index 2926810..331e41e 100644 --- a/google/compression_utils_portable.cc +++ b/google/compression_utils_portable.cc @@ -5,7 +5,7 @@ * found in the Chromium source repository LICENSE file. */ -#include "third_party/zlib/google/compression_utils_portable.h" +#include "compression_utils_portable.h" #include <stddef.h> #include <stdlib.h> diff --git a/google/compression_utils_portable.h b/google/compression_utils_portable.h index cd004e8..c467bf7 100644 --- a/google/compression_utils_portable.h +++ b/google/compression_utils_portable.h @@ -9,10 +9,13 @@ #include <stdint.h> +/* TODO(cavalcantii): remove support for Chromium ever building with a system + * zlib. + */ #if defined(USE_SYSTEM_ZLIB) #include <zlib.h> #else -#include "third_party/zlib/zlib.h" +#include "zlib.h" #endif namespace zlib_internal { |