diff options
Diffstat (limited to '')
| -rw-r--r-- | tools/dumpkey/Android.mk | 5 | ||||
| -rw-r--r-- | tools/recovery_l10n/Android.mk | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/tools/dumpkey/Android.mk b/tools/dumpkey/Android.mk index 31549146d..c528c3bf9 100644 --- a/tools/dumpkey/Android.mk +++ b/tools/dumpkey/Android.mk @@ -14,9 +14,14 @@ LOCAL_PATH := $(call my-dir) +# Pre Oreo trees have dumpkey defined elsewhere in the tree +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26; echo $$?),0) + 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 diff --git a/tools/recovery_l10n/Android.mk b/tools/recovery_l10n/Android.mk index 937abd1e1..9fb797cf3 100644 --- a/tools/recovery_l10n/Android.mk +++ b/tools/recovery_l10n/Android.mk @@ -1,5 +1,9 @@ # Copyright 2012 Google Inc. All Rights Reserved. + +# Prevent RecoveryLocalizer already defined errors in older trees +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 24; echo $$?),0) + LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -10,3 +14,5 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src) include $(BUILD_PACKAGE) + +endif |