summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Risan <risan@google.com> 2018-11-02 21:15:02 -0700
committer android-build-merger <android-build-merger@google.com> 2018-11-02 21:15:02 -0700
commit8ca9a21450ebb68740fcd5adfe2be0fb99c8a08f (patch)
tree8d08d56c5b2f6975f2f1fa910d3ef807b3f3cb18
parent822ea2298781bdfeac65dc7fde8a73d8f27e4359 (diff)
parentde6858efc7545b60fa2f344b22187ee2a896df5e (diff)
Merge "ARC++ swap for QuotaUtils"
am: de6858efc7 Change-Id: I6609ec79dbbefd53214f4dcd7cea5313cffd3002
-rw-r--r--cmds/installd/Android.bp50
1 files changed, 50 insertions, 0 deletions
diff --git a/cmds/installd/Android.bp b/cmds/installd/Android.bp
index 3c42ede116..2e9701f8b0 100644
--- a/cmds/installd/Android.bp
+++ b/cmds/installd/Android.bp
@@ -34,6 +34,21 @@ cc_defaults {
"libutils",
],
+ product_variables: {
+ arc: {
+ exclude_srcs: [
+ "QuotaUtils.cpp",
+ ],
+ static_libs: [
+ "libarcdiskquota",
+ "arc_services_aidl",
+ ],
+ cflags: [
+ "-DUSE_ARC",
+ ],
+ },
+ },
+
clang: true,
tidy: true,
@@ -60,6 +75,26 @@ cc_library_static {
aidl: {
export_aidl_headers: true,
},
+
+ product_variables: {
+ arc: {
+ exclude_srcs: [
+ "QuotaUtils.cpp",
+ ],
+ static_libs: [
+ "libarcdiskquota",
+ "arc_services_aidl",
+ ],
+ cflags: [
+ "-DUSE_ARC",
+ ],
+ },
+ },
+}
+
+cc_library_headers {
+ name: "libinstalld_headers",
+ export_include_dirs: ["."],
}
//
@@ -74,6 +109,21 @@ cc_binary {
static_libs: ["libdiskusage"],
init_rc: ["installd.rc"],
+
+ product_variables: {
+ arc: {
+ exclude_srcs: [
+ "QuotaUtils.cpp",
+ ],
+ static_libs: [
+ "libarcdiskquota",
+ "arc_services_aidl",
+ ],
+ cflags: [
+ "-DUSE_ARC",
+ ],
+ },
+ },
}
// OTA chroot tool