diff options
| author | Mattias Nissler <mnissler@google.com> | 2016-02-24 14:21:38 +0100 |
|---|---|---|
| committer | Mattias Nissler <mnissler@google.com> | 2016-02-24 16:06:32 +0100 |
| commit | 2c8e54b0ac9d70c7f1824be18b00b1fe1151851a (patch) | |
| tree | c802ee26deda2cd02b5e70caa5105ca755557f2f | |
| parent | 4659ab114720ff904e409fbd507c1b7f5e0754a5 (diff) | |
| download | libmincrypt-2c8e54b0ac9d70c7f1824be18b00b1fe1151851a.tar.gz | |
Prepare mincrypt tools for move to recovery repo.
This adds a conditional build guard to enable a smooth move of the
dumpkey tool to the bootable/recovery project without breaking the
build during the transition period.
BUG:27326256
Change-Id: Ia23b31bb559a668273b5c0548b7bd1797049a224
| -rw-r--r-- | tools/Android.mk | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tools/Android.mk b/tools/Android.mk index 3154914..f403621 100644 --- a/tools/Android.mk +++ b/tools/Android.mk @@ -14,9 +14,19 @@ 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 := false +endif + +ifeq ($(BUILD_DUMPKEY_FROM_RECOVERY),false) 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 |