gen build files

Change-Id: I9b7b658a5c9eb891ed7f3f182ec503b5b0c7e85a
diff --git a/Android.bp b/Android.bp
index e3b8075..5372b41 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1342,6 +1342,7 @@
 cc_library_shared {
     name: "libperfetto_framework_jni",
     srcs: [
+        ":perfetto_include_perfetto_base_base",
         ":perfetto_include_perfetto_public_abi_base",
         ":perfetto_include_perfetto_public_abi_public",
         ":perfetto_include_perfetto_public_base",
@@ -1384,6 +1385,7 @@
 cc_library_shared {
     name: "libperfetto_jni",
     srcs: [
+        ":perfetto_include_perfetto_base_base",
         ":perfetto_include_perfetto_public_abi_base",
         ":perfetto_include_perfetto_public_abi_public",
         ":perfetto_include_perfetto_public_base",
@@ -13957,6 +13959,10 @@
 android_library {
     name: "perfetto_src_android_sdk_java_test_perfetto_trace_test_lib",
     srcs: [
+        "src/android_sdk/java/test/dev/perfetto/sdk/InternPoolTest.java",
+        "src/android_sdk/java/test/dev/perfetto/sdk/ProtoWriterTest.java",
+        "src/android_sdk/java/test/dev/perfetto/sdk/test/PerfettoDataSourceTest.java",
+        "src/android_sdk/java/test/dev/perfetto/sdk/test/PerfettoEventEmitTest.java",
         "src/android_sdk/java/test/dev/perfetto/sdk/test/PerfettoTraceTest.java",
     ],
     manifest: "src/android_sdk/java/test/AndroidTestManifest.xml",
@@ -13975,9 +13981,10 @@
 filegroup {
     name: "perfetto_src_android_sdk_jni_libperfetto_framework_jni_src",
     srcs: [
+        "src/android_sdk/jni/dev_perfetto_sdk_PerfettoDataSource.cc",
+        "src/android_sdk/jni/dev_perfetto_sdk_PerfettoEvent.cc",
         "src/android_sdk/jni/dev_perfetto_sdk_PerfettoNativeMemoryCleaner.cc",
         "src/android_sdk/jni/dev_perfetto_sdk_PerfettoTrace.cc",
-        "src/android_sdk/jni/dev_perfetto_sdk_PerfettoTrackEventExtra.cc",
     ],
 }
 
@@ -13985,9 +13992,10 @@
 filegroup {
     name: "perfetto_src_android_sdk_jni_libperfetto_jni_src",
     srcs: [
+        "src/android_sdk/jni/dev_perfetto_sdk_PerfettoDataSource.cc",
+        "src/android_sdk/jni/dev_perfetto_sdk_PerfettoEvent.cc",
         "src/android_sdk/jni/dev_perfetto_sdk_PerfettoNativeMemoryCleaner.cc",
         "src/android_sdk/jni/dev_perfetto_sdk_PerfettoTrace.cc",
-        "src/android_sdk/jni/dev_perfetto_sdk_PerfettoTrackEventExtra.cc",
     ],
 }
 
@@ -21025,10 +21033,15 @@
 java_defaults {
     name: "perfetto_trace_lib_java_defaults",
     srcs: [
+        "src/android_sdk/java/main/dev/perfetto/sdk/EmitBuffer.java",
+        "src/android_sdk/java/main/dev/perfetto/sdk/InternPool.java",
+        "src/android_sdk/java/main/dev/perfetto/sdk/PerfettoDataSource.java",
+        "src/android_sdk/java/main/dev/perfetto/sdk/PerfettoEvent.java",
         "src/android_sdk/java/main/dev/perfetto/sdk/PerfettoNativeMemoryCleaner.java",
         "src/android_sdk/java/main/dev/perfetto/sdk/PerfettoTrace.java",
+        "src/android_sdk/java/main/dev/perfetto/sdk/PerfettoTrack.java",
         "src/android_sdk/java/main/dev/perfetto/sdk/PerfettoTrackEventBuilder.java",
-        "src/android_sdk/java/main/dev/perfetto/sdk/PerfettoTrackEventExtra.java",
+        "src/android_sdk/java/main/dev/perfetto/sdk/ProtoWriter.java",
     ],
     libs: [
         "error_prone_annotations",
diff --git a/BUILD b/BUILD
index 1ab1a3e..f677b2f 100644
--- a/BUILD
+++ b/BUILD
@@ -6481,10 +6481,15 @@
 perfetto_android_library(
     name = "src_android_sdk_java_main_perfetto_trace_lib",
     srcs = [
+        "src/android_sdk/java/main/dev/perfetto/sdk/EmitBuffer.java",
+        "src/android_sdk/java/main/dev/perfetto/sdk/InternPool.java",
+        "src/android_sdk/java/main/dev/perfetto/sdk/PerfettoDataSource.java",
+        "src/android_sdk/java/main/dev/perfetto/sdk/PerfettoEvent.java",
         "src/android_sdk/java/main/dev/perfetto/sdk/PerfettoNativeMemoryCleaner.java",
         "src/android_sdk/java/main/dev/perfetto/sdk/PerfettoTrace.java",
+        "src/android_sdk/java/main/dev/perfetto/sdk/PerfettoTrack.java",
         "src/android_sdk/java/main/dev/perfetto/sdk/PerfettoTrackEventBuilder.java",
-        "src/android_sdk/java/main/dev/perfetto/sdk/PerfettoTrackEventExtra.java",
+        "src/android_sdk/java/main/dev/perfetto/sdk/ProtoWriter.java",
     ],
     manifest = "src/android_sdk/java/main/AndroidManifest.xml",
     deps = [
@@ -6518,6 +6523,10 @@
     name = "src_android_sdk_java_test_perfetto_trace_test_lib",
     testonly = True,
     srcs = [
+        "src/android_sdk/java/test/dev/perfetto/sdk/InternPoolTest.java",
+        "src/android_sdk/java/test/dev/perfetto/sdk/ProtoWriterTest.java",
+        "src/android_sdk/java/test/dev/perfetto/sdk/test/PerfettoDataSourceTest.java",
+        "src/android_sdk/java/test/dev/perfetto/sdk/test/PerfettoEventEmitTest.java",
         "src/android_sdk/java/test/dev/perfetto/sdk/test/PerfettoTraceTest.java",
     ],
     manifest = "src/android_sdk/java/test/AndroidTestManifest.xml",
@@ -6544,6 +6553,7 @@
         "-llog",
     ],
     hdrs = [
+        ":include_perfetto_base_base",
         ":include_perfetto_public_abi_base",
         ":include_perfetto_public_abi_public",
         ":include_perfetto_public_base",
@@ -6563,11 +6573,13 @@
 perfetto_filegroup(
     name = "src_android_sdk_jni_libperfetto_jni_src",
     srcs = [
+        "src/android_sdk/jni/dev_perfetto_sdk_PerfettoDataSource.cc",
+        "src/android_sdk/jni/dev_perfetto_sdk_PerfettoDataSource.h",
+        "src/android_sdk/jni/dev_perfetto_sdk_PerfettoEvent.cc",
+        "src/android_sdk/jni/dev_perfetto_sdk_PerfettoEvent.h",
         "src/android_sdk/jni/dev_perfetto_sdk_PerfettoNativeMemoryCleaner.cc",
         "src/android_sdk/jni/dev_perfetto_sdk_PerfettoNativeMemoryCleaner.h",
         "src/android_sdk/jni/dev_perfetto_sdk_PerfettoTrace.cc",
-        "src/android_sdk/jni/dev_perfetto_sdk_PerfettoTrackEventExtra.cc",
-        "src/android_sdk/jni/dev_perfetto_sdk_PerfettoTrackEventExtra.h",
         "src/android_sdk/jni/macros.h",
     ],
 )