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(-) 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