From ef7ee4ba9dbd5cfe45c198018981c867a8b06a8f Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Mon, 21 Mar 2022 09:23:29 -0400 Subject: [PATCH 1/4] Add header dependency since CHIPCert uses the generated header --- src/credentials/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/src/credentials/BUILD.gn b/src/credentials/BUILD.gn index d715ce595d8f4e..12a5c904aeca7b 100644 --- a/src/credentials/BUILD.gn +++ b/src/credentials/BUILD.gn @@ -70,6 +70,7 @@ static_library("credentials") { cflags = [ "-Wconversion" ] public_deps = [ + "${chip_root}/src/asni:asn1oid_header", "${chip_root}/src/crypto", "${chip_root}/src/lib/asn1", "${chip_root}/src/lib/core", From 1824d1fe4c67bd4b521061b5ec90784b200cecc7 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Mon, 21 Mar 2022 09:25:22 -0400 Subject: [PATCH 2/4] Fix typo --- src/credentials/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/credentials/BUILD.gn b/src/credentials/BUILD.gn index 12a5c904aeca7b..59d7833b948d6c 100644 --- a/src/credentials/BUILD.gn +++ b/src/credentials/BUILD.gn @@ -70,7 +70,7 @@ static_library("credentials") { cflags = [ "-Wconversion" ] public_deps = [ - "${chip_root}/src/asni:asn1oid_header", + "${chip_root}/src/asn1:asn1oid_header", "${chip_root}/src/crypto", "${chip_root}/src/lib/asn1", "${chip_root}/src/lib/core", From 80548fe805e0251d2665c6672a38981671f7e51b Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Mon, 21 Mar 2022 09:26:31 -0400 Subject: [PATCH 3/4] Correct the path for compilation --- src/credentials/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/credentials/BUILD.gn b/src/credentials/BUILD.gn index 59d7833b948d6c..cfe316f5a83389 100644 --- a/src/credentials/BUILD.gn +++ b/src/credentials/BUILD.gn @@ -70,9 +70,9 @@ static_library("credentials") { cflags = [ "-Wconversion" ] public_deps = [ - "${chip_root}/src/asn1:asn1oid_header", "${chip_root}/src/crypto", "${chip_root}/src/lib/asn1", + "${chip_root}/src/lib/asn1:asn1oid_header", "${chip_root}/src/lib/core", "${chip_root}/src/lib/support", "${chip_root}/src/platform", From e34de513dd75226e4474d9dfbe5433052d9bd1e5 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Mon, 21 Mar 2022 09:29:13 -0400 Subject: [PATCH 4/4] Move dependency into tests: they include FabricTable and ChipCert --- src/credentials/BUILD.gn | 1 - src/lib/support/tests/BUILD.gn | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/credentials/BUILD.gn b/src/credentials/BUILD.gn index cfe316f5a83389..d715ce595d8f4e 100644 --- a/src/credentials/BUILD.gn +++ b/src/credentials/BUILD.gn @@ -72,7 +72,6 @@ static_library("credentials") { public_deps = [ "${chip_root}/src/crypto", "${chip_root}/src/lib/asn1", - "${chip_root}/src/lib/asn1:asn1oid_header", "${chip_root}/src/lib/core", "${chip_root}/src/lib/support", "${chip_root}/src/platform", diff --git a/src/lib/support/tests/BUILD.gn b/src/lib/support/tests/BUILD.gn index f7f6cd97ae3028..6a1615243933fb 100644 --- a/src/lib/support/tests/BUILD.gn +++ b/src/lib/support/tests/BUILD.gn @@ -69,6 +69,7 @@ chip_test_suite("tests") { cflags = [ "-Wconversion" ] public_deps = [ + "${chip_root}/src/credentials", "${chip_root}/src/lib/core", "${chip_root}/src/lib/support/jsontlv", "${chip_root}/src/platform",