1 files changed, 33 insertions, 42 deletions

diff --git a/simpleperf/Android.bp b/simpleperf/Android.bp
index 685ee6c8..be134209 100644
--- a/simpleperf/Android.bp
+++ b/simpleperf/Android.bp
@@ -96,6 +96,37 @@ cc_library_static {
 }
 
 cc_defaults {
+    name: "libsimpleperf_dex_read_static_reqs_defaults",
+    defaults: ["libdexfile_static_defaults"],
+    static_libs: [
+        "libdexfile_support_static",
+    ],
+    header_libs: ["libdexfile_external_headers"],
+    export_header_lib_headers: ["libdexfile_external_headers"],
+}
+
+cc_library_static {
+    name: "libsimpleperf_dex_read",
+    defaults: [
+        "simpleperf_defaults",
+        "libsimpleperf_dex_read_static_reqs_defaults",
+    ],
+    host_supported: true,
+
+    export_include_dirs: [
+        ".",
+    ],
+
+    static_libs: ["libbase"],
+
+    srcs: [
+        "read_dex_file.cpp",
+    ],
+
+    group_static_libs: true,
+}
+
+cc_defaults {
     name: "simpleperf_cflags",
     target: {
         host: {
@@ -116,37 +147,6 @@ cc_defaults {
     },
 }
 
-// linked as a separate library because using OpenCSD headers needs to enable exception
-cc_library_static {
-    name: "libsimpleperf_etm_decoder",
-    defaults: [
-        "simpleperf_cflags",
-        "libsimpleperf_elf_read_static_reqs_defaults",
-    ],
-    host_supported: true,
-    srcs: ["ETMDecoder.cpp"],
-    cppflags: [
-        // flags needed to include libopencsd_decoder headers
-        "-Wno-ignored-qualifiers",
-        "-Wno-unused-parameter",
-        "-Wno-switch",
-        "-Wno-unused-private-field",
-        "-Wno-implicit-fallthrough",
-        "-fexceptions",
-    ],
-    rtti: true,
-    static_libs: [
-        "libopencsd_decoder",
-        "libbase",
-        "liblog",
-    ],
-    target: {
-        windows: {
-            enabled: true,
-        }
-    }
-}
-
 cc_defaults {
     name: "simpleperf_static_libs",
     defaults: [
@@ -155,12 +155,10 @@ cc_defaults {
     ],
     host_supported: true,
     static_libs: [
-        "libsimpleperf_etm_decoder",
         "libbase",
         "liblog",
         "libutils",
         "libprotobuf-cpp-lite",
-        "libopencsd_decoder",
     ],
     target: {
         linux: {
@@ -199,10 +197,6 @@ cc_defaults {
         "libprotobuf-cpp-lite",
         "libziparchive",
     ],
-    static_libs: [
-        "libsimpleperf_etm_decoder",
-        "libopencsd_decoder",
-    ],
     target: {
         linux: {
             shared_libs: [
@@ -263,7 +257,6 @@ cc_defaults {
     srcs: [
         "cmd_dumprecord.cpp",
         "cmd_help.cpp",
-        "cmd_inject.cpp",
         "cmd_kmem.cpp",
         "cmd_report.cpp",
         "cmd_report_sample.cpp",
@@ -292,7 +285,6 @@ cc_defaults {
                 "cmd_stat.cpp",
                 "cmd_trace_sched.cpp",
                 "environment.cpp",
-                "ETMRecorder.cpp",
                 "event_fd.cpp",
                 "event_selection_set.cpp",
                 "InplaceSamplerClient.cpp",
@@ -358,7 +350,7 @@ cc_binary {
         "simpleperf_static_libs",
     ],
     dist: {
-        targets: ["simpleperf"],
+        targets: ["sdk", "win_sdk", "simpleperf"],
     },
     srcs: [
         "main.cpp",
@@ -462,7 +454,7 @@ cc_library_shared {
         "simpleperf_static_libs",
     ],
     dist: {
-        targets: ["simpleperf"],
+        targets: ["sdk", "win_sdk", "simpleperf"],
     },
     srcs: [
         "report_lib_interface.cpp",
@@ -535,7 +527,6 @@ cc_library_shared {
 cc_defaults {
     name: "simpleperf_test_srcs",
     srcs: [
-        "cmd_inject_test.cpp",
         "cmd_kmem_test.cpp",
         "cmd_report_test.cpp",
         "cmd_report_sample_test.cpp",