From aedae617fec702add64201534a2f514fa31c5965 Mon Sep 17 00:00:00 2001 From: Risan Date: Mon, 27 Nov 2017 18:01:35 +0900 Subject: [PATCH] [Vold] Conditional dependency to ARC++ ObbVolume Test: Compile Change-Id: Ic6348f7816b28302d45c05a359548a5d034fde24 Bug: 64500663 --- Android.bp | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Android.bp b/Android.bp index 5941cd9..0377beb 100644 --- a/Android.bp +++ b/Android.bp @@ -80,6 +80,11 @@ cc_library_static { }, } +cc_library_headers { + name: "libvold_headers", + export_include_dirs: ["."], +} + // Static library factored out to support testing cc_library_static { name: "libvold", @@ -123,6 +128,16 @@ cc_library_static { "model/VolumeBase.cpp", "secontext.cpp", ], + product_variables: { + arc: { + exclude_srcs: [ + "model/ObbVolume.cpp", + ], + static_libs: [ + "libarcobbvolume", + ], + }, + }, } cc_binary { @@ -134,6 +149,13 @@ cc_binary { srcs: ["main.cpp"], static_libs: ["libvold"], + product_variables: { + arc: { + static_libs: [ + "libarcobbvolume", + ] + }, + }, init_rc: ["vold.rc"], required: [