aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMattias Nissler2016-02-26 04:04:32 -0600
committerMattias Nissler2016-02-26 04:20:18 -0600
commitb66f047d41f3ff5e06baa63b3705d189a697035c (patch)
tree62fcf983521561fbcde2febda2fa4937417404f5 /tools
parent5197fde242e00d6ee112896846da8d0be6303c56 (diff)
downloadplatform-bootable-recovery-b66f047d41f3ff5e06baa63b3705d189a697035c.tar.gz
platform-bootable-recovery-b66f047d41f3ff5e06baa63b3705d189a697035c.tar.xz
platform-bootable-recovery-b66f047d41f3ff5e06baa63b3705d189a697035c.zip
Remove dumpkey build guards after completing code move.
Bug: 27326256 Change-Id: Ia713b23e3c898c1f10af7c61ea67f34601fdcbe3
Diffstat (limited to 'tools')
-rw-r--r--tools/dumpkey/Android.mk10
1 files changed, 0 insertions, 10 deletions
diff --git a/tools/dumpkey/Android.mk b/tools/dumpkey/Android.mk
index bbd06566..31549146 100644
--- a/tools/dumpkey/Android.mk
+++ b/tools/dumpkey/Android.mk
@@ -14,19 +14,9 @@
14 14
15LOCAL_PATH := $(call my-dir) 15LOCAL_PATH := $(call my-dir)
16 16
17# Determine whether to build dumpkey from system/core/libmincrypt or from
18# bootable/recovery/tools. The dumpkey source is temporarily present in both
19# locations during the process of moving the tool to the recovery repository.
20# TODO(mnissler): Remove the guard after the transition is complete.
21ifndef BUILD_DUMPKEY_FROM_RECOVERY
22BUILD_DUMPKEY_FROM_RECOVERY := true
23endif
24
25ifeq ($(BUILD_DUMPKEY_FROM_RECOVERY),true)
26include $(CLEAR_VARS) 17include $(CLEAR_VARS)
27LOCAL_MODULE := dumpkey 18LOCAL_MODULE := dumpkey
28LOCAL_SRC_FILES := DumpPublicKey.java 19LOCAL_SRC_FILES := DumpPublicKey.java
29LOCAL_JAR_MANIFEST := DumpPublicKey.mf 20LOCAL_JAR_MANIFEST := DumpPublicKey.mf
30LOCAL_STATIC_JAVA_LIBRARIES := bouncycastle-host 21LOCAL_STATIC_JAVA_LIBRARIES := bouncycastle-host
31include $(BUILD_HOST_JAVA_LIBRARY) 22include $(BUILD_HOST_JAVA_LIBRARY)
32endif