tp: switch from dict to list of pairs in descriptor generation script
This ensures if we have the same file being used to generate two
descriptors, we can handle both; with a dict, we'd only regenerate one
of them.
Bug: 162807918
Change-Id: Ib1a907f6d52c51ee1e5cef3dddacaa7f52cafb41
diff --git a/tools/gen_binary_descriptors b/tools/gen_binary_descriptors
index 8c1a277..05cbde9 100755
--- a/tools/gen_binary_descriptors
+++ b/tools/gen_binary_descriptors
@@ -26,22 +26,36 @@
import textwrap
from compat import iteritems
-SOURCE_TARGET = {
- 'protos/perfetto/config/perfetto_config.proto':
- 'src/perfetto_cmd/perfetto_config.descriptor.h',
- 'protos/perfetto/metrics/metrics.proto':
- 'src/trace_processor/metrics/metrics.descriptor.h',
- 'src/protozero/test/example_proto/test_messages.proto':
- 'src/protozero/test/example_proto/test_messages.descriptor.h',
- 'protos/perfetto/trace/track_event/track_event.proto':
- 'src/trace_processor/importers/proto/track_event.descriptor.h',
- 'protos/perfetto/metrics/chrome/all_chrome_metrics.proto':
- 'src/trace_processor/metrics/chrome/all_chrome_metrics.descriptor.h',
- 'protos/perfetto/trace_processor/trace_processor.proto':
- 'src/trace_processor/python/trace_processor/trace_processor.descriptor',
- 'protos/perfetto/metrics/metrics.proto':
- 'src/trace_processor/python/trace_processor/metrics.descriptor',
-}
+SOURCE_TARGET = [
+ (
+ 'protos/perfetto/config/perfetto_config.proto',
+ 'src/perfetto_cmd/perfetto_config.descriptor.h'
+ ),
+ (
+ 'protos/perfetto/metrics/metrics.proto',
+ 'src/trace_processor/metrics/metrics.descriptor.h'
+ ),
+ (
+ 'src/protozero/test/example_proto/test_messages.proto',
+ 'src/protozero/test/example_proto/test_messages.descriptor.h'
+ ),
+ (
+ 'protos/perfetto/trace/track_event/track_event.proto',
+ 'src/trace_processor/importers/proto/track_event.descriptor.h'
+ ),
+ (
+ 'protos/perfetto/metrics/chrome/all_chrome_metrics.proto',
+ 'src/trace_processor/metrics/chrome/all_chrome_metrics.descriptor.h'
+ ),
+ (
+ 'protos/perfetto/trace_processor/trace_processor.proto',
+ 'src/trace_processor/python/trace_processor/trace_processor.descriptor'
+ ),
+ (
+ 'protos/perfetto/metrics/metrics.proto',
+ 'src/trace_processor/python/trace_processor/metrics.descriptor'
+ ),
+]
ROOT_DIR = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
@@ -211,7 +225,7 @@
args = parser.parse_args()
try:
- for source, target in iteritems(SOURCE_TARGET):
+ for source, target in SOURCE_TARGET:
if args.check_only:
check(source, target)
else:
