summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wright <jonathan.wright@arm.com>2020-07-15 23:33:06 +0100
committerJonathan Wright <jonathan.wright@arm.com>2020-07-15 23:43:32 +0100
commitab7cd970a83609f98e8542cea8b81e8d92ddab83 (patch)
tree359614be4cf047d62f2786f68c4c5e209fb548f5
parente7ef8c3b9fed5d4c687a1ba92f8a3878328b4d15 (diff)
Fix header dependency chains in BUILD.gn file
Previous commits adding the libjpeg_turbo_unittests target did not declare some header dependencies as "public_deps", breaking builds that relied upon the "libjpeg" target. This commit fixes the broken header file chain and has been verified using: gn check <build-directory> Bug: 993876 Change-Id: I616628fb384c47063ac9fcecc86b65dc155aab6c
-rw-r--r--BUILD.gn13
1 files changed, 2 insertions, 11 deletions
diff --git a/BUILD.gn b/BUILD.gn
index d733cc1..548aab5 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -192,7 +192,7 @@ config("libjpeg_config") {
include_dirs = [ "." ]
}
-source_set("libjpeg_sources") {
+static_library("libjpeg") {
sources = [
"jcapimin.c",
"jcapistd.c",
@@ -250,12 +250,7 @@ source_set("libjpeg_sources") {
"jutils.c",
"jversion.h",
]
-}
-static_library("libjpeg") {
- deps = [
- ":libjpeg_sources"
- ]
defines = [
"WITH_SIMD",
"NO_GETENV",
@@ -289,10 +284,6 @@ static_library("turbojpeg") {
"wrppm.c",
]
- deps = [
- ":libjpeg_sources"
- ]
-
defines = [
"WITH_SIMD",
"BMP_SUPPORTED",
@@ -303,7 +294,7 @@ static_library("turbojpeg") {
public_configs = [ ":libjpeg_config" ]
public_deps = [
- ":libjpeg_headers",
+ ":libjpeg",
]
# MemorySanitizer doesn't support assembly code, so keep it disabled in