summaryrefslogtreecommitdiffstats
path: root/CaCerts.mk
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2014-05-23 15:12:42 -0700
committerIan Rogers <irogers@google.com>2014-06-09 20:39:00 -0700
commit3deabd220cf7b1ca0824987e90b8ecc07087f05a (patch)
treea737476c6d4125cdef0e99dba94bb992b076acb9 /CaCerts.mk
parentd6e67fd7082cf8c6ef5544dc740f9052add21538 (diff)
downloadlibcore-3deabd220cf7b1ca0824987e90b8ecc07087f05a.zip
libcore-3deabd220cf7b1ca0824987e90b8ecc07087f05a.tar.gz
libcore-3deabd220cf7b1ca0824987e90b8ecc07087f05a.tar.bz2
Remove deprecated WITH_HOST_DALVIK.
Bug: 13751317 Fix the Mac host build: - conditionally define constants using pre-existing pattern, - make Posix calls that the Mac doesn't support throw UnsupportedOperationException. Change-Id: Ib68887cbe36ab167d042eb96c7834bce0651b078
Diffstat (limited to 'CaCerts.mk')
-rw-r--r--CaCerts.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/CaCerts.mk b/CaCerts.mk
index 980d0fb..f85f524 100644
--- a/CaCerts.mk
+++ b/CaCerts.mk
@@ -50,10 +50,9 @@ cacerts: $(cacerts_target)
# This is so that build/target/product/core.mk can use cacerts in PRODUCT_PACKAGES
ALL_MODULES.cacerts.INSTALLED := $(cacerts_target)
-ifeq ($(WITH_HOST_DALVIK),true)
cacerts_host_directory := $(HOST_OUT)/etc/security/cacerts
$(foreach cacert, $(cacerts), $(eval $(call include-prebuilt-with-destination-directory,host-cacert-$(notdir $(cacert)),$(cacert),$(cacerts_host_directory))))
-endif
+
cacerts_host := $(addprefix $(cacerts_host_directory)/,$(foreach cacert,$(cacerts),$(notdir $(cacert))))
.PHONY: cacerts-host
cacerts-host: $(cacerts_host)