From 263ad29e8f6ca14eb779a1ec031a394906c27fe0 Mon Sep 17 00:00:00 2001 From: Motomu Utsumi Date: Thu, 12 Jan 2023 14:51:55 +0900 Subject: [PATCH] cronet: Fix BUILD.gn to follow aosp/2374766 aosp/2374766 removed some targets from the BUILD.gn but there are some targets that depend on the removed targets, which makes gn gen fail. This CL fixes clean up targets to fix this issue. Test: gn gen --- components/cronet/BUILD.gn | 1 - components/cronet/android/BUILD.gn | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/components/cronet/BUILD.gn b/components/cronet/BUILD.gn index a5a8c142fca18..2a56f4e165617 100644 --- a/components/cronet/BUILD.gn +++ b/components/cronet/BUILD.gn @@ -7,7 +7,6 @@ import("//build/toolchain/toolchain.gni") import("//build/util/lastchange.gni") import("//build/util/process_version.gni") import("//chrome/version.gni") -import("//components/cronet/native/include/headers.gni") import("//components/grpc_support/include/headers.gni") import("//testing/test.gni") diff --git a/components/cronet/android/BUILD.gn b/components/cronet/android/BUILD.gn index e7ec8817bb11d..2e077665f93b9 100644 --- a/components/cronet/android/BUILD.gn +++ b/components/cronet/android/BUILD.gn @@ -11,7 +11,6 @@ import("//build/config/zip.gni") import("//build/util/lastchange.gni") import("//build/util/process_version.gni") import("//chrome/version.gni") -import("//components/cronet/native/include/headers.gni") import("//components/grpc_support/include/headers.gni") import("//testing/test.gni") import("//third_party/netty4/netty4.gni") @@ -159,7 +158,6 @@ source_set("cronet_static") { "//components/cronet:cronet_common", "//components/cronet:cronet_version_header", "//components/cronet:metrics_util", - "//components/cronet/native:cronet_native_impl", "//components/prefs", "//net", "//third_party/zlib:zlib", @@ -1179,7 +1177,6 @@ test("cronet_unittests_android") { "//base", "//base/test:test_support", "//components/cronet:cronet_common_unittests", - "//components/cronet/native:cronet_native_unittests", "//components/prefs:test_support", "//net", "//net:test_support", @@ -1202,7 +1199,6 @@ test("cronet_tests_android") { ":cronet_static", "//base", "//base/test:test_support", - "//components/cronet/native/test:cronet_native_tests", "//components/prefs:test_support", "//net", "//net:test_support", @@ -1420,7 +1416,7 @@ copy("cronet_package_copy") { } copy("cronet_package_copy_native_headers") { - sources = cronet_native_public_headers + grpc_public_headers + sources = grpc_public_headers outputs = [ "$_package_dir/include/{{source_file_part}}" ] } -- 2.40.1.495.gc816e09b53d-goog