From 03b72b0f377d352a7197b2cbb3c90ebed3321bcc Mon Sep 17 00:00:00 2001 From: Mattias Nissler Date: Wed, 24 Feb 2016 14:45:06 +0100 Subject: Move dumpkey tool to the recovery repo. The dumpkey tool is used to dump encryption keys in a custom format used by the recovery code. Nobody else uses this format AFAICT, so it's more appropriate to keep the code of the tool alongside the recovery code instead of next to mincrypt. BUG:27326256 Change-Id: I30176845617972be1d6e46e9a9218e161fbf0680 --- tools/dumpkey/Android.mk | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 tools/dumpkey/Android.mk (limited to 'tools/dumpkey/Android.mk') diff --git a/tools/dumpkey/Android.mk b/tools/dumpkey/Android.mk new file mode 100644 index 000000000..bbd065664 --- /dev/null +++ b/tools/dumpkey/Android.mk @@ -0,0 +1,32 @@ +# Copyright (C) 2008 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +LOCAL_PATH := $(call my-dir) + +# Determine whether to build dumpkey from system/core/libmincrypt or from +# bootable/recovery/tools. The dumpkey source is temporarily present in both +# locations during the process of moving the tool to the recovery repository. +# TODO(mnissler): Remove the guard after the transition is complete. +ifndef BUILD_DUMPKEY_FROM_RECOVERY +BUILD_DUMPKEY_FROM_RECOVERY := true +endif + +ifeq ($(BUILD_DUMPKEY_FROM_RECOVERY),true) +include $(CLEAR_VARS) +LOCAL_MODULE := dumpkey +LOCAL_SRC_FILES := DumpPublicKey.java +LOCAL_JAR_MANIFEST := DumpPublicKey.mf +LOCAL_STATIC_JAVA_LIBRARIES := bouncycastle-host +include $(BUILD_HOST_JAVA_LIBRARY) +endif -- cgit v1.2.3 From b66f047d41f3ff5e06baa63b3705d189a697035c Mon Sep 17 00:00:00 2001 From: Mattias Nissler Date: Fri, 26 Feb 2016 11:04:32 +0100 Subject: Remove dumpkey build guards after completing code move. Bug: 27326256 Change-Id: Ia713b23e3c898c1f10af7c61ea67f34601fdcbe3 --- tools/dumpkey/Android.mk | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'tools/dumpkey/Android.mk') diff --git a/tools/dumpkey/Android.mk b/tools/dumpkey/Android.mk index bbd065664..31549146d 100644 --- a/tools/dumpkey/Android.mk +++ b/tools/dumpkey/Android.mk @@ -14,19 +14,9 @@ LOCAL_PATH := $(call my-dir) -# Determine whether to build dumpkey from system/core/libmincrypt or from -# bootable/recovery/tools. The dumpkey source is temporarily present in both -# locations during the process of moving the tool to the recovery repository. -# TODO(mnissler): Remove the guard after the transition is complete. -ifndef BUILD_DUMPKEY_FROM_RECOVERY -BUILD_DUMPKEY_FROM_RECOVERY := true -endif - -ifeq ($(BUILD_DUMPKEY_FROM_RECOVERY),true) include $(CLEAR_VARS) LOCAL_MODULE := dumpkey LOCAL_SRC_FILES := DumpPublicKey.java LOCAL_JAR_MANIFEST := DumpPublicKey.mf LOCAL_STATIC_JAVA_LIBRARIES := bouncycastle-host include $(BUILD_HOST_JAVA_LIBRARY) -endif -- cgit v1.2.3