PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove dumpkey build guards after completing code move."

Browse Source
This commit is contained in:
Mattias Nissler
2016-03-01 11:46:27 +00:00
committed by Gerrit Code Review
parent 5197fde242 b66f047d41
commit 5ffc038be6
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/dumpkey/Android.mk
-10
View File
@@ -14,19 +14,9 @@
LOCAL_PATH := $(call my-dir) 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) include $(CLEAR_VARS)
LOCAL_MODULE := dumpkey LOCAL_MODULE := dumpkey
LOCAL_SRC_FILES := DumpPublicKey.java LOCAL_SRC_FILES := DumpPublicKey.java
LOCAL_JAR_MANIFEST := DumpPublicKey.mf LOCAL_JAR_MANIFEST := DumpPublicKey.mf
LOCAL_STATIC_JAVA_LIBRARIES := bouncycastle-host LOCAL_STATIC_JAVA_LIBRARIES := bouncycastle-host
include $(BUILD_HOST_JAVA_LIBRARY) include $(BUILD_HOST_JAVA_LIBRARY)
endif