1 files changed, 24 insertions, 74 deletions

diff --git a/memory_replay/Android.bp b/memory_replay/Android.bp
index ab5a380f..824ac125 100644
--- a/memory_replay/Android.bp
+++ b/memory_replay/Android.bp
@@ -1,61 +1,29 @@
-//
-// Copyright (C) 2018 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-cc_defaults {
-    name: "memory_flag_defaults",
-    host_supported: false,
-
-    cflags: [
-        "-Wall",
-        "-Wextra",
-        "-Werror",
-    ],
-
-    compile_multilib: "both",
-}
-
 cc_defaults {
     name: "memory_replay_defaults",
-    defaults: ["memory_flag_defaults"],
+    host_supported: true,
 
     srcs: [
-        "Alloc.cpp",
-        "File.cpp",
+        "Action.cpp",
+        "LineBuffer.cpp",
         "NativeInfo.cpp",
         "Pointers.cpp",
         "Thread.cpp",
         "Threads.cpp",
     ],
-
-    shared_libs: [
-        "libbase",
-        "libziparchive",
-    ],
-
-    static_libs: [
-        "libasync_safe",
+    cflags: [
+        "-Wall",
+        "-Wextra",
+        "-Werror",
     ],
-}
-
-cc_binary {
-    name: "memory_replay",
-    defaults: ["memory_replay_defaults"],
+    shared_libs: ["libbase"],
 
-    srcs: ["main.cpp"],
+    target: {
+        darwin: {
+            enabled: false,
+        },
+    },
 
+    compile_multilib: "both",
     multilib: {
         lib32: {
             suffix: "32",
@@ -64,16 +32,23 @@ cc_binary {
             suffix: "64",
         },
     },
+
+}
+
+cc_binary {
+    name: "memory_replay",
+    defaults: ["memory_replay_defaults"],
+
+    srcs: ["main.cpp"],
 }
 
 cc_test {
     name: "memory_replay_tests",
     defaults: ["memory_replay_defaults"],
-    isolated: true,
 
     srcs: [
-        "tests/AllocTest.cpp",
-        "tests/FileTest.cpp",
+        "tests/ActionTest.cpp",
+        "tests/LineBufferTest.cpp",
         "tests/NativeInfoTest.cpp",
         "tests/PointersTest.cpp",
         "tests/ThreadTest.cpp",
@@ -87,29 +62,4 @@ cc_test {
             test_suites: ["device-tests"],
         },
     },
-
-    data: [
-        "tests/test.txt",
-        "tests/test.zip",
-    ],
-}
-
-cc_benchmark {
-    name: "trace_benchmark",
-    defaults: ["memory_flag_defaults"],
-
-    srcs: [
-        "Alloc.cpp",
-        "TraceBenchmark.cpp",
-        "File.cpp",
-    ],
-
-    shared_libs: [
-        "libbase",
-        "libziparchive",
-    ],
-
-    data: [
-        "traces/*.zip",
-    ],
 }