Skip to content

Commit bdd7742

Browse files
committed
Amalgamated source for v24.1
Change-Id: Iab8ae69781056b522e888d36342ce481e0e928c1
1 parent ee00258 commit bdd7742

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

sdk/perfetto.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
// This file is automatically generated by gen_amalgamated. Do not edit.
1616

1717
// gen_amalgamated: predefined macros
18+
#if !defined(GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER)
19+
#define GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
20+
#endif
1821
#if !defined(GOOGLE_PROTOBUF_NO_RTTI)
1922
#define GOOGLE_PROTOBUF_NO_RTTI
2023
#endif
2124
#if !defined(PERFETTO_IMPLEMENTATION)
2225
#define PERFETTO_IMPLEMENTATION
2326
#endif
24-
#if !defined(GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER)
25-
#define GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
26-
#endif
2727
#include "perfetto.h"
2828
// gen_amalgamated begin source: src/base/android_utils.cc
2929
// gen_amalgamated begin header: include/perfetto/ext/base/android_utils.h
@@ -6843,8 +6843,8 @@ const char* GetVersionString();
68436843
#ifndef GEN_PERFETTO_VERSION_GEN_H_
68446844
#define GEN_PERFETTO_VERSION_GEN_H_
68456845

6846-
#define PERFETTO_VERSION_STRING() "v24.0-aca9cf63b"
6847-
#define PERFETTO_VERSION_SCM_REVISION() "aca9cf63bb8c8a6141a15075aa4fc73bbb66fb9a"
6846+
#define PERFETTO_VERSION_STRING() "v24.1-ee002581a"
6847+
#define PERFETTO_VERSION_SCM_REVISION() "ee002581ad43cda9bc2ccca6f6ba43de19b5819e"
68486848

68496849
#endif // GEN_PERFETTO_VERSION_GEN_H_
68506850
/*

0 commit comments

Comments
 (0)