1 files changed, 64 insertions, 12 deletions

diff --git a/artd/Android.bp b/artd/Android.bp
index 6db12877fe..1288ebcf25 100644
--- a/artd/Android.bp
+++ b/artd/Android.bp
@@ -22,31 +22,83 @@ package {
     default_applicable_licenses: ["art_license"],
 }
 
-art_cc_binary {
-    name: "artd",
+cc_defaults {
+    name: "artd_defaults",
     defaults: ["art_defaults"],
-
     srcs: [
         "artd.cc",
+        "file_utils.cc",
+        "path_utils.cc",
+    ],
+    header_libs: [
+        "art_cmdlineparser_headers",
+        "profman_headers",
     ],
-
     shared_libs: [
-        "artd-aidl-ndk",
-        "libartbase",
-        "libarttools",
+        "libarttools", // Contains "libc++fs".
         "libbase",
         "libbinder_ndk",
+        "libselinux",
     ],
+    static_libs: [
+        "artd-aidl-ndk",
+    ],
+}
 
+art_cc_binary {
+    name: "artd",
+    defaults: ["artd_defaults"],
+    srcs: [
+        "artd_main.cc",
+    ],
+    shared_libs: [
+        "libart",
+        "libartbase",
+    ],
     apex_available: [
         "com.android.art",
         "com.android.art.debug",
     ],
 }
 
-prebuilt_etc {
-    name: "com.android.art.artd.init.rc",
-    src: "artd.rc",
-    filename: "init.rc",
-    installable: false,
+art_cc_defaults {
+    name: "art_artd_tests_defaults",
+    defaults: ["artd_defaults"],
+    static_libs: [
+        "libgmock",
+    ],
+    srcs: [
+        "artd_test.cc",
+        "file_utils_test.cc",
+        "path_utils_test.cc",
+    ],
+    data: [
+        ":art-gtest-jars-Main",
+        ":art-gtest-jars-Nested",
+    ],
+}
+
+// Version of ART gtest `art_artd_tests` bundled with the ART APEX on target.
+//
+// This test requires the full libbinder_ndk implementation on host, which is
+// not available as a prebuilt on the thin master-art branch. Hence it won't
+// work there, and there's a conditional in Android.gtest.mk to exclude it from
+// test-art-host-gtest.
+art_cc_test {
+    name: "art_artd_tests",
+    defaults: [
+        "art_gtest_defaults",
+        "art_artd_tests_defaults",
+    ],
+}
+
+// Standalone version of ART gtest `art_artd_tests`, not bundled with the ART
+// APEX on target.
+art_cc_test {
+    name: "art_standalone_artd_tests",
+    defaults: [
+        "art_standalone_gtest_defaults",
+        "art_artd_tests_defaults",
+    ],
+    test_config_template: "art_standalone_artd_tests.xml",
 }