Merge "igt-gpu-tools: Extract common code into a library"

am: 67c5c7e356

Change-Id: I9b95cb69f9b9c004374e85c2ea8a929265a339db

1 files changed, 32 insertions, 17 deletions

diff --git a/Android.bp b/Android.bp
index 3cbbf140..4b03563a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,7 +1,23 @@
-cc_test {
-    name: "gem_blt",
+cc_defaults {
+    name: "igt-gpu-tools-defaults",
+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wno-missing-field-initializers",
+        "-Wno-unused-parameter",
+        "-Wno-unused-variable",
+        "-DHAVE_GETTID",
+        "-DHAVE_LIBGEN_H",
+        "-DHAVE_MEMFD_CREATE",
+    ],
+    static_libs: ["libelf", "libkmod"],
+    shared_libs: ["libdrm", "libunwind"],
+}
+
+cc_library_static {
+    name: "igt-gpu-tools",
+    defaults: ["igt-gpu-tools-defaults"],
     srcs: [
-        "benchmarks/gem_blt.c",
         "lib/drmtest.c",
         "lib/igt_aux.c",
         "lib/igt_core.c",
@@ -12,22 +28,21 @@ cc_test {
         "lib/ioctl_wrappers.c",
         "lib/i915/gem_mman.c",
     ],
-    cflags: [
-        "-Wall",
-        "-Werror",
-        "-Wno-missing-field-initializers",
-        "-Wno-unused-parameter",
-        "-Wno-unused-variable",
-        "-DHAVE_GETTID",
-        "-DHAVE_LIBGEN_H",
-        "-DHAVE_MEMFD_CREATE",
-    ],
-    local_include_dirs: [
+    export_include_dirs: [
         "lib",
         "lib/stubs/drm",
         "prebuilt-intermediates",
     ],
-    static_libs: ["libelf", "libkmod"],
-    shared_libs: ["libdrm", "libunwind"],
-    stl: "none",
+}
+
+cc_defaults {
+    name: "igt-gpu-tools-test-defaults",
+    defaults: ["igt-gpu-tools-defaults"],
+    static_libs: ["igt-gpu-tools"],
+}
+
+cc_test {
+    name: "gem_blt",
+    defaults: ["igt-gpu-tools-test-defaults"],
+    srcs: ["benchmarks/gem_blt.c"],
 }