1 files changed, 30 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 477efe2ef..3eebe4ec7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,6 +12,15 @@ cc_defaults {
     ],
     static_libs: ["libelf", "libkmod", "libion", "liblog"],
     shared_libs: ["libdrm"],
+    compile_multilib: "both",
+    multilib: {
+        lib32: {
+            suffix: "32",
+        },
+        lib64: {
+            suffix: "64"
+        },
+    },
 }
 
 cc_library_static {
@@ -58,28 +67,49 @@ cc_test {
     name: "gem_blt",
     defaults: ["igt-gpu-tools-test-defaults"],
     srcs: ["benchmarks/gem_blt.c"],
+    gtest: false,
 }
 
 cc_test {
     name: "kms_flip",
     defaults: ["igt-gpu-tools-test-defaults"],
     srcs: ["tests/kms_flip.c"],
+    gtest: false,
 }
 
 cc_test {
     name: "kms_atomic",
     defaults: ["igt-gpu-tools-test-defaults"],
     srcs: ["tests/kms_atomic.c"],
+    gtest: false,
 }
 
 cc_test {
     name: "ion_fb",
     defaults: ["igt-gpu-tools-test-defaults"],
     srcs: ["tests/ion_fb.c"],
+    gtest: false,
 }
 
 cc_test {
     name: "kms_vblank",
     defaults: ["igt-gpu-tools-test-defaults"],
     srcs: ["tests/kms_vblank.c"],
+    gtest: false,
+}
+
+python_test_host {
+    name: "igt_gpu_tools",
+    main: "scripts/test_igt_gpu_tools.py",
+    srcs: [ "scripts/test_igt_gpu_tools.py", ],
+    data: [ "scripts/test_igt_gpu_tools.xml" ],
+    test_config: "scripts/test_igt_gpu_tools.xml",
+    version: {
+        py2: {
+            enabled: false,
+        },
+        py3: {
+            enabled: true,
+        },
+    },
 }