diff options
| author | Ian Rogers <irogers@google.com> | 2014-05-23 15:12:42 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-06-09 20:39:00 -0700 |
| commit | 222b63194378c8eb4116d5f3bb318b04ce3c4e45 (patch) | |
| tree | 92733e3c88072283cf044c9dc1b37d8a2b59ba36 | |
| parent | 1fca2c873abbaeb7f4b7e1af3528fa044903c18f (diff) | |
| download | ca-certificates-222b63194378c8eb4116d5f3bb318b04ce3c4e45.tar.gz | |
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
| -rw-r--r-- | CaCerts.mk | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -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) |