diff options
| author | Anton Hansson <hansson@google.com> | 2018-07-05 09:05:14 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-07-05 09:05:14 -0700 |
| commit | 2c3288c7079fd101041154eb21380f775509dc04 (patch) | |
| tree | d48308fd22e33ee9fc2f6fbbce92f6ff047534ef | |
| parent | f4fee4bb8bc3abde60a395ba664c5f302e1462ac (diff) | |
| parent | bcfbbbab2192ad6bfcf9f2b7202445ea75c31c4b (diff) | |
| download | ca-certificates-2c3288c7079fd101041154eb21380f775509dc04.tar.gz | |
Refactor ca-certificates makefiles. am: a5108d9212
am: bcfbbbab21
Change-Id: I65a0a7bd7b5c2212fc5f0e030113bb0509a95b7a
| -rw-r--r-- | Android.mk | 35 | ||||
| -rw-r--r-- | google/Android.mk | 35 |
2 files changed, 46 insertions, 24 deletions
@@ -43,20 +43,31 @@ endef cacerts := $(call all-files-under,files) -cacerts_target_directory := $(TARGET_OUT)/etc/security/cacerts -$(foreach cacert, $(cacerts), $(eval $(call include-prebuilt-with-destination-directory,target-cacert-$(notdir $(cacert)),$(cacert),$(cacerts_target_directory)))) -cacerts_target := $(addprefix $(cacerts_target_directory)/,$(foreach cacert,$(cacerts),$(notdir $(cacert)))) -.PHONY: cacerts_target -cacerts: $(cacerts_target) +$(foreach cacert,$(cacerts),$(eval \ + $(call include-prebuilt-with-destination-directory,\ + target-cacert-$(notdir $(cacert)),\ + $(cacert),\ + $(TARGET_OUT)/etc/security/cacerts\ + )\ +)) -# This is so that build/target/product/core.mk can use cacerts in PRODUCT_PACKAGES -ALL_MODULES.cacerts.INSTALLED := $(cacerts_target) +include $(CLEAR_VARS) +LOCAL_MODULE := cacerts +LOCAL_REQUIRED_MODULES := $(foreach cacert,$(cacerts),target-cacert-$(notdir $(cacert))) +include $(BUILD_PHONY_PACKAGE) -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)))) +$(foreach cacert,$(cacerts),$(eval \ + $(call include-prebuilt-with-destination-directory,\ + host-cacert-$(notdir $(cacert)),\ + $(cacert),\ + $(HOST_OUT)/etc/security/cacerts\ + )\ +)) -cacerts_host := $(addprefix $(cacerts_host_directory)/,$(foreach cacert,$(cacerts),$(notdir $(cacert)))) -.PHONY: cacerts-host -cacerts-host: $(cacerts_host) +include $(CLEAR_VARS) +LOCAL_MODULE := cacerts-host +LOCAL_IS_HOST_MODULE := true +LOCAL_REQUIRED_MODULES := $(foreach cacert,$(cacerts),host-cacert-$(notdir $(cacert))) +include $(BUILD_PHONY_PACKAGE) include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/google/Android.mk b/google/Android.mk index 80de0b0..5955efd 100644 --- a/google/Android.mk +++ b/google/Android.mk @@ -17,18 +17,29 @@ LOCAL_PATH := $(call my-dir) cacerts_google := $(call all-files-under,files) -cacerts_google_target_directory := $(TARGET_OUT)/etc/security/cacerts_google -$(foreach cacert, $(cacerts_google), $(eval $(call include-prebuilt-with-destination-directory,target-cacert-google-$(notdir $(cacert)),$(cacert),$(cacerts_google_target_directory)))) -cacerts_google_target := $(addprefix $(cacerts_google_target_directory)/,$(foreach cacert,$(cacerts_google),$(notdir $(cacert)))) -.PHONY: cacerts_google_target -cacerts_google: $(cacerts_google_target) +$(foreach cacert,$(cacerts_google),$(eval \ + $(call include-prebuilt-with-destination-directory,\ + target-cacert-google-$(notdir $(cacert)),\ + $(cacert),\ + $(TARGET_OUT)/etc/security/cacerts_google\ + )\ +)) -# This is so that build/target/product/core.mk can use cacerts_google in PRODUCT_PACKAGES -ALL_MODULES.cacerts_google.INSTALLED := $(cacerts_google_target) +include $(CLEAR_VARS) +LOCAL_MODULE := cacerts_google +LOCAL_REQUIRED_MODULES := $(foreach cacert,$(cacerts_google),target-cacert-google-$(notdir $(cacert))) +include $(BUILD_PHONY_PACKAGE) -cacerts_google_host_directory := $(HOST_OUT)/etc/security/cacerts_google -$(foreach cacert, $(cacerts_google), $(eval $(call include-prebuilt-with-destination-directory,host-cacert-google-$(notdir $(cacert)),$(cacert),$(cacerts_google_host_directory)))) +$(foreach cacert,$(cacerts_google),$(eval \ + $(call include-prebuilt-with-destination-directory,\ + host-cacert-google-$(notdir $(cacert)),\ + $(cacert),\ + $(HOST_OUT)/etc/security/cacerts_google\ + )\ +)) -cacerts_google_host := $(addprefix $(cacerts_google_host_directory)/,$(foreach cacert,$(cacerts_google),$(notdir $(cacert)))) -.PHONY: cacerts_google-host -cacerts_google-host: $(cacerts_google_host) +include $(CLEAR_VARS) +LOCAL_MODULE := cacerts_google-host +LOCAL_IS_HOST_MODULE := true +LOCAL_REQUIRED_MODULES := $(foreach cacert,$(cacerts_google),host-cacert-google-$(notdir $(cacert))) +include $(BUILD_PHONY_PACKAGE) |