Merge "Add config and event protos for network tracing." into tm-mainline-prod
diff --git a/Android.bp b/Android.bp
index cdaba95..b238396 100644
--- a/Android.bp
+++ b/Android.bp
@@ -862,8 +862,9 @@
"//apex_available:platform",
"com.android.art",
"com.android.art.debug",
+ "com.android.tethering",
],
- min_sdk_version: "S",
+ min_sdk_version: "30",
}
// GN: //src/perfetto_cmd:perfetto
diff --git a/src/protozero/proto_decoder.cc b/src/protozero/proto_decoder.cc
index a766a28..0595c1f 100644
--- a/src/protozero/proto_decoder.cc
+++ b/src/protozero/proto_decoder.cc
@@ -46,8 +46,8 @@
// Parses one field and returns the field itself and a pointer to the next
// field to parse. If parsing fails, the returned |next| == |buffer|.
-PERFETTO_ALWAYS_INLINE ParseFieldResult
-ParseOneField(const uint8_t* const buffer, const uint8_t* const end) {
+ParseFieldResult ParseOneField(const uint8_t* const buffer,
+ const uint8_t* const end) {
ParseFieldResult res{ParseFieldResult::kAbort, buffer, Field{}};
// The first byte of a proto field is structured as follows:
@@ -172,7 +172,6 @@
return res;
}
-PERFETTO_ALWAYS_INLINE
Field ProtoDecoder::ReadField() {
ParseFieldResult res;
do {
diff --git a/tools/gen_android_bp b/tools/gen_android_bp
index 11e5bea..8328e82 100755
--- a/tools/gen_android_bp
+++ b/tools/gen_android_bp
@@ -241,9 +241,9 @@
'libperfetto_client_experimental': [
('apex_available', {
'//apex_available:platform', 'com.android.art',
- 'com.android.art.debug'
+ 'com.android.art.debug', 'com.android.tethering'
}),
- ('min_sdk_version', 'S'),
+ ('min_sdk_version', '30'),
('shared_libs', {'liblog'}),
('export_include_dirs', {'include', buildflags_dir}),
],
