diff options
| author | Primiano Tucci <primiano@google.com> | 2021-11-02 22:14:39 +0000 |
|---|---|---|
| committer | Primiano Tucci <primiano@google.com> | 2021-11-02 22:16:49 +0000 |
| commit | 894dcac46f642752e1adb5db2cf1bf985c62988a (patch) | |
| tree | 8835b317721e907b386dc416b0137ebf9f9ad976 | |
| parent | ab45a01476084a3a62f9da1b6e28ec07aeed01bc (diff) | |
| download | perfetto-894dcac46f642752e1adb5db2cf1bf985c62988a.tar.gz | |
gen_amalgamated: Fix version code
A previous CL caused perfetto_enable_git_rev_version_header to
become unexpectedly false in the amalgamated build.
That is undesirable as omits the GIT commit in the version.
The last version (v20.1) had it.
Test: manual (while following the SDK release docs)
Change-Id: If4e0e00f80bd5a16e52b3a3c0038c8c681ccfc33
(cherry picked from commit adb22cfb36ccc1a8c485d6f98b6cbc42481c3887)
| -rwxr-xr-x | tools/gen_amalgamated | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/gen_amalgamated b/tools/gen_amalgamated index e2faa61c0..c1cb2bc4d 100755 --- a/tools/gen_amalgamated +++ b/tools/gen_amalgamated @@ -43,11 +43,12 @@ default_targets = [ # Arguments for the GN output directory (unless overridden from the command # line). gn_args = ' '.join([ + 'enable_perfetto_ipc=true', 'is_debug=false', 'is_perfetto_build_generator=true', 'is_perfetto_embedder=true', + 'perfetto_enable_git_rev_version_header=true', 'use_custom_libcxx=false', - 'enable_perfetto_ipc=true', ]) # By default, the amalgamated .h only recurses in #includes but not in the |