diff options
Diffstat (limited to 'meta-oe/recipes-devtools/perfetto/perfetto.bb')
| -rw-r--r-- | meta-oe/recipes-devtools/perfetto/perfetto.bb | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/meta-oe/recipes-devtools/perfetto/perfetto.bb b/meta-oe/recipes-devtools/perfetto/perfetto.bb index d697485e69..52fb36ef40 100644 --- a/meta-oe/recipes-devtools/perfetto/perfetto.bb +++ b/meta-oe/recipes-devtools/perfetto/perfetto.bb | |||
| @@ -24,7 +24,6 @@ SRC_URI:append = " \ | |||
| 24 | git://chromium.googlesource.com/chromium/src/third_party/zlib.git;nobranch=1;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/zlib;name=zlib \ | 24 | git://chromium.googlesource.com/chromium/src/third_party/zlib.git;nobranch=1;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/zlib;name=zlib \ |
| 25 | git://android.googlesource.com/platform/external/lzma.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/lzma;name=lzma \ | 25 | git://android.googlesource.com/platform/external/lzma.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/lzma;name=lzma \ |
| 26 | git://android.googlesource.com/platform/external/zstd.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/zstd;name=zstd \ | 26 | git://android.googlesource.com/platform/external/zstd.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/zstd;name=zstd \ |
| 27 | https://storage.googleapis.com/perfetto/gn-linux64-1968-0725d782;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/;name=gn \ | ||
| 28 | \ | 27 | \ |
| 29 | file://0001-Remove-check_build_deps-build-steps.patch \ | 28 | file://0001-Remove-check_build_deps-build-steps.patch \ |
| 30 | " | 29 | " |
| @@ -45,8 +44,6 @@ SRCREV_zstd = "77211fcc5e08c781734a386402ada93d0d18d093" | |||
| 45 | 44 | ||
| 46 | SRCREV_FORMAT .= "_bionic_core_lzma_libprocinfo_logging_unwinding_protobuf_libbase_libcxx_libcxxabi_libunwind_zlib_zstd" | 45 | SRCREV_FORMAT .= "_bionic_core_lzma_libprocinfo_logging_unwinding_protobuf_libbase_libcxx_libcxxabi_libunwind_zlib_zstd" |
| 47 | 46 | ||
| 48 | SRC_URI[gn.sha256sum] = "f706aaa0676e3e22f5fc9ca482295d7caee8535d1869f99efa2358177b64f5cd" | ||
| 49 | |||
| 50 | require perfetto.inc | 47 | require perfetto.inc |
| 51 | 48 | ||
| 52 | DEPENDS += " ninja-native gn-native" | 49 | DEPENDS += " ninja-native gn-native" |
| @@ -71,12 +68,6 @@ B = "${WORKDIR}/build" | |||
| 71 | do_configure () { | 68 | do_configure () { |
| 72 | # Configuration needs to be done from the source directory | 69 | # Configuration needs to be done from the source directory |
| 73 | cd ${S} | 70 | cd ${S} |
| 74 | # Rename a few build tools if they have not been renamed | ||
| 75 | cd buildtools | ||
| 76 | |||
| 77 | mkdir linux64 && cp ${RECIPE_SYSROOT_NATIVE}${bindir}/gn linux64/gn | ||
| 78 | chmod +x linux64/gn | ||
| 79 | cd .. | ||
| 80 | 71 | ||
| 81 | CC_BIN=`echo $CC | awk '{print $1}'` | 72 | CC_BIN=`echo $CC | awk '{print $1}'` |
| 82 | CXX_BIN=`echo $CXX | awk '{print $1}'` | 73 | CXX_BIN=`echo $CXX | awk '{print $1}'` |
| @@ -109,7 +100,7 @@ do_configure () { | |||
| 109 | ARGS=$ARGS" target_linker=\"$CC_BIN ${TUNE_CCARGS} ${LDFLAGS}\"" | 100 | ARGS=$ARGS" target_linker=\"$CC_BIN ${TUNE_CCARGS} ${LDFLAGS}\"" |
| 110 | ARGS=$ARGS" target_ar=\"$AR\"" | 101 | ARGS=$ARGS" target_ar=\"$AR\"" |
| 111 | ARGS="'$ARGS'" | 102 | ARGS="'$ARGS'" |
| 112 | cmd="tools/gn gen --args=$ARGS ${B}" | 103 | cmd="gn gen --args=$ARGS ${B}" |
| 113 | 104 | ||
| 114 | echo $cmd | 105 | echo $cmd |
| 115 | # Use eval, not just call $cmd, due to escaping of single quotation marks | 106 | # Use eval, not just call $cmd, due to escaping of single quotation marks |
