| Patrick Williams | 975a06f | 2022-10-21 14:42:47 -0500 | [diff] [blame^] | 1 | From 3b7091243ec03054ca8800b51b85a1c09e7e3075 Mon Sep 17 00:00:00 2001 |
| 2 | From: Sui Chen <suichen6@gmail.com> |
| 3 | Date: Mon, 13 Jun 2022 17:46:49 +0000 |
| 4 | Subject: [PATCH] Remove "check_build_deps" build steps |
| 5 | |
| 6 | When building with Bitbake, we want Bitbake to manage our dependencies, |
| 7 | so we remove the "check_build_deps" steps from Perfetto. |
| 8 | |
| 9 | Also setting "is_cross_compiling" to true, so that the host-side tools |
| 10 | (such as protoc) will always be generated using the native toolchain, |
| 11 | rather than the Bitbake-generated one. |
| 12 | |
| 13 | Signed-off-by: Sui Chen <suichen6@gmail.com> |
| 14 | --- |
| 15 | gn/BUILD.gn | 1 - |
| 16 | gn/standalone/BUILD.gn | 12 ++++++------ |
| 17 | gn/standalone/BUILDCONFIG.gn | 5 +++-- |
| 18 | 3 files changed, 9 insertions(+), 9 deletions(-) |
| 19 | |
| 20 | diff --git a/gn/BUILD.gn b/gn/BUILD.gn |
| 21 | index 8a7ca72a8..e4a2d39f0 100644 |
| 22 | --- a/gn/BUILD.gn |
| 23 | +++ b/gn/BUILD.gn |
| 24 | @@ -111,7 +111,6 @@ group("default_deps") { |
| 25 | deps = [ ":gen_buildflags" ] |
| 26 | if (perfetto_build_standalone) { |
| 27 | public_deps = [ |
| 28 | - "//gn/standalone:check_build_deps", |
| 29 | "//gn/standalone/libc++:deps", |
| 30 | "//gn/standalone/sanitizers:deps", |
| 31 | ] |
| 32 | diff --git a/gn/standalone/BUILD.gn b/gn/standalone/BUILD.gn |
| 33 | index 582e9b867..9c77ac64c 100644 |
| 34 | --- a/gn/standalone/BUILD.gn |
| 35 | +++ b/gn/standalone/BUILD.gn |
| 36 | @@ -441,10 +441,10 @@ config("android_liblog") { |
| 37 | } |
| 38 | |
| 39 | # Checks that tools/install-build-deps has been run since it last changed. |
| 40 | -perfetto_check_build_deps("check_build_deps") { |
| 41 | - args = [] |
| 42 | -} |
| 43 | +#perfetto_check_build_deps("check_build_deps") { |
| 44 | +# args = [] |
| 45 | +#} |
| 46 | |
| 47 | -perfetto_check_build_deps("check_build_deps_android") { |
| 48 | - args = [ "--android" ] |
| 49 | -} |
| 50 | +#perfetto_check_build_deps("check_build_deps_android") { |
| 51 | +# args = [ "--android" ] |
| 52 | +#} |
| 53 | diff --git a/gn/standalone/BUILDCONFIG.gn b/gn/standalone/BUILDCONFIG.gn |
| 54 | index 6f32686c1..c041989b0 100644 |
| 55 | --- a/gn/standalone/BUILDCONFIG.gn |
| 56 | +++ b/gn/standalone/BUILDCONFIG.gn |
| 57 | @@ -59,8 +59,9 @@ declare_args() { |
| 58 | # the ossfuzz sanitizer overrides this to true. In that config the |
| 59 | # host/target cpu and arch are identical, but we want to build only the |
| 60 | # targets with the sanitizer/fuzzer flags |
| 61 | - is_cross_compiling = |
| 62 | - target_cpu != host_cpu || target_os != host_os || target_triplet != "" |
| 63 | + |
| 64 | + # for Bitbake build |
| 65 | + is_cross_compiling = true |
| 66 | } |
| 67 | default_configs = [ |
| 68 | "//gn/standalone:debug_symbols", |
| 69 | -- |
| 70 | 2.37.1 |
| 71 | |