summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattias Nissler <mnissler@google.com>2016-03-01 17:42:22 +0100
committerandroid-build-merger <android-build-merger@google.com>2016-03-01 17:42:22 +0100
commit4934bb7e850da07d37c7006a8af61b3e32d7b9ea (patch)
tree6f581ab2fa66970852ac3ea2853a5faa73fb9af3
parentMerge "Fixes to wear recovery for N" into nyc-dev am: 9db7964834 (diff)
parentMerge "Remove dumpkey build guards after completing code move." am: 5ffc038be6 (diff)
downloadandroid_bootable_recovery-4934bb7e850da07d37c7006a8af61b3e32d7b9ea.tar
android_bootable_recovery-4934bb7e850da07d37c7006a8af61b3e32d7b9ea.tar.gz
android_bootable_recovery-4934bb7e850da07d37c7006a8af61b3e32d7b9ea.tar.bz2
android_bootable_recovery-4934bb7e850da07d37c7006a8af61b3e32d7b9ea.tar.lz
android_bootable_recovery-4934bb7e850da07d37c7006a8af61b3e32d7b9ea.tar.xz
android_bootable_recovery-4934bb7e850da07d37c7006a8af61b3e32d7b9ea.tar.zst
android_bootable_recovery-4934bb7e850da07d37c7006a8af61b3e32d7b9ea.zip
-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 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