diff options
| author | Kenny Root <kroot@google.com> | 2015-09-21 13:33:52 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-09-21 13:49:05 -0700 |
| commit | 04c74e4ee7b6563f36ebdbe164d0ce79963a4cf5 (patch) | |
| tree | 6e73f8eb420b19da660b13a1ef0df71caf2ef2e9 | |
| parent | 7cf911cd17542aec87db0d36dfb071f14b35da95 (diff) | |
| download | ca-certificates-04c74e4ee7b6563f36ebdbe164d0ce79963a4cf5.tar.gz | |
Rename CaCerts.mk to Android.mk
This was split out of the libcore project, so we need to make it
buildable by itself. Tweaking a few directory names and making sure that
it knows its LOCAL_PATH is all that's needed.
Change-Id: Ic2612a0d7e91572cb3c2f5b486409048f1546d08
| -rw-r--r-- | Android.mk (renamed from CaCerts.mk) | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +LOCAL_PATH := $(call my-dir) + # # Definitions for installing Certificate Authority (CA) certificates # @@ -30,7 +32,7 @@ endef define include-prebuilt-with-destination-directory include $$(CLEAR_VARS) LOCAL_MODULE := $(1) -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/CaCerts.mk +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MODULE_STEM := $(notdir $(2)) LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := ETC @@ -39,7 +41,7 @@ LOCAL_SRC_FILES := $(2) include $$(BUILD_PREBUILT) endef -cacerts := $(call all-files-under,luni/src/main/files/cacerts) +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)))) |