diff options
author | Mattias Nissler <mnissler@google.com> | 2016-03-01 17:38:50 +0100 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-03-01 17:38:50 +0100 |
commit | c4d143356ef1a406bb641b2f1504ab72f083a6bd (patch) | |
tree | 71cc6dcdc6553a3cef6e1be3f662a8998a890365 | |
parent | Merge "Fixes to wear recovery for N" into nyc-dev (diff) | |
parent | Merge "Remove dumpkey build guards after completing code move." (diff) | |
download | android_bootable_recovery-c4d143356ef1a406bb641b2f1504ab72f083a6bd.tar android_bootable_recovery-c4d143356ef1a406bb641b2f1504ab72f083a6bd.tar.gz android_bootable_recovery-c4d143356ef1a406bb641b2f1504ab72f083a6bd.tar.bz2 android_bootable_recovery-c4d143356ef1a406bb641b2f1504ab72f083a6bd.tar.lz android_bootable_recovery-c4d143356ef1a406bb641b2f1504ab72f083a6bd.tar.xz android_bootable_recovery-c4d143356ef1a406bb641b2f1504ab72f083a6bd.tar.zst android_bootable_recovery-c4d143356ef1a406bb641b2f1504ab72f083a6bd.zip |
-rw-r--r-- | tools/dumpkey/Android.mk | 10 |
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 |