Update GenericAtom definition to decouple from metrics_constants proto

Bug: 110537998
Test: statsd, statsd_test
Change-Id: Ib82b90731f7c49a9e27ceff5d5fdb8e2cd6fb4e6

cmds/statsd/Android.bp

@@ -25,7 +25,6 @@ cc_library_host_shared {
     ],
 
     shared_libs: [
-        "libmetricprotos",
         "libplatformprotos",
     ],
 
@@ -38,7 +37,6 @@ cc_library_host_shared {
     },
 
     export_shared_lib_headers: [
-        "libmetricprotos",
         "libplatformprotos",
     ]
 

cmds/statsd/Android.mk

@@ -232,7 +232,6 @@ LOCAL_SRC_FILES := \
 LOCAL_STATIC_LIBRARIES := \
     $(statsd_common_static_libraries) \
     libgmock \
-    libmetricprotos \
     libplatformprotos
 
 LOCAL_PROTOC_OPTIMIZE_TYPE := full
@@ -253,7 +252,6 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := statsdprotolite
 
 LOCAL_SRC_FILES := \
-    src/metrics_constants/metrics_constants.proto \
     src/stats_log.proto \
     src/statsd_config.proto \
     src/atoms.proto
@@ -317,7 +315,6 @@ LOCAL_AIDL_INCLUDES := $(statsd_common_aidl_includes)
 
 LOCAL_STATIC_LIBRARIES := \
     $(statsd_common_static_libraries) \
-    libmetricprotos \
     libplatformprotos
 
 LOCAL_SHARED_LIBRARIES := $(statsd_common_shared_libraries) \

cmds/statsd/src/atoms.proto

@@ -29,7 +29,6 @@ import "frameworks/base/core/proto/android/server/enums.proto";
 import "frameworks/base/core/proto/android/telecomm/enums.proto";
 import "frameworks/base/core/proto/android/telephony/enums.proto";
 import "frameworks/base/core/proto/android/view/enums.proto";
-import "frameworks/base/proto/src/metrics_constants.proto";
 
 /**
  * The master atom class. This message defines all of the available
@@ -2160,11 +2159,11 @@ message BinderCallsExceptions {
 
 /**
  * An atom for generic metrics logging. Available from Android Q.
- * One has to add an enum to frameworks/base/proto/src/metrics_constants.proto
- * to extend another metric.
  */
 message GenericAtom {
-  // Type of event. Previously it only indicated visual elements but now it
-  // is expanded to describe any type of event.
-  optional com_android_internal_logging.MetricsEvent.View view = 1;
+    // The uid of the application that sent this custom atom.
+    optional int32 uid = 1 [(is_uid) = true];
+
+    // An event_id indicates the type of event.
+    optional int32 event_id = 2;
 }

cmds/statsd/src/metrics_constants/metrics_constants.proto

@@ -1 +0,0 @@
-../../../../proto/src/metrics_constants.proto

proto/Android.bp

@@ -17,33 +17,3 @@ java_library_static {
         },
     },
 }
-
-cc_library {
-    name: "libmetricprotos",
-    host_supported: true,
-    proto: {
-        export_proto_headers: true,
-        include_dirs: ["external/protobuf/src"],
-    },
-    cflags: [
-        "-Wall",
-        "-Werror",
-        "-Wno-unused-parameter",
-    ],
-    srcs: ["src/metrics_constants.proto"],
-    target: {
-        host: {
-            proto: {
-                type: "full",
-            },
-        },
-        android: {
-            proto: {
-                type: "lite",
-            },
-            shared: {
-                enabled: false,
-            },
-        },
-    },
-}