commit fd410b9e5640c72121d6a8f386dc2cdaaf4dc7fb
author Treehugger Robot <treehugger-gerrit@google.com> Wed Oct 21 21:04:14 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Oct 21 21:04:14 2020 +0000
tree 227e650845ee8253ca6b2551f7889c212b7f8783
parent fa8736c237a07575412766d87c1376fdb1e80d28
parent 8ab7f17d3c5812d217342221b7bd6af0c67fca76

Merge "Fix test/Android.bp on ARC builds" am: 8b4da2ffa8 am: 8ab7f17d3c

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1467064

Change-Id: I184558ce8a0ff20fda750a60487946148d77e9a7

cmds/installd/tests/Android.bp

diff --git a/cmds/installd/tests/Android.bp b/cmds/installd/tests/Android.bp
index bd45005..7c9e3b2 100644
--- a/cmds/installd/tests/Android.bp
+++ b/cmds/installd/tests/Android.bp
@@ -41,6 +41,21 @@
         "liblogwrap",
     ],
     test_config: "installd_cache_test.xml",
+
+    product_variables: {
+        arc: {
+            exclude_srcs: [
+                "QuotaUtils.cpp",
+            ],
+            static_libs: [
+                "libarcdiskquota",
+                "arc_services_aidl",
+            ],
+            cflags: [
+                "-DUSE_ARC",
+            ],
+        },
+    },
 }
 
 cc_test {
@@ -66,6 +81,21 @@
         "liblogwrap",
     ],
     test_config: "installd_service_test.xml",
+
+    product_variables: {
+        arc: {
+            exclude_srcs: [
+                "QuotaUtils.cpp",
+            ],
+            static_libs: [
+                "libarcdiskquota",
+                "arc_services_aidl",
+            ],
+            cflags: [
+                "-DUSE_ARC",
+            ],
+        },
+    },
 }
 
 cc_test {
@@ -93,6 +123,21 @@
         "libz",
     ],
     test_config: "installd_dexopt_test.xml",
+
+    product_variables: {
+        arc: {
+            exclude_srcs: [
+                "QuotaUtils.cpp",
+            ],
+            static_libs: [
+                "libarcdiskquota",
+                "arc_services_aidl",
+            ],
+            cflags: [
+                "-DUSE_ARC",
+            ],
+        },
+    },
 }
 
 cc_test {