From eb22c940acbc98a77157173c0ae0bd8e26c69ede Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 8 May 2019 12:33:12 -0700 Subject: [PATCH] Move BUILD_[HOST_]SHARED_TEST_LIBRARY to obsolete list The implementation of these rules have been an $(error) for almost 3 years. Test: treehugger Change-Id: I2e258d297172532c0993c8cb8a2e19ad03ea281d --- Deprecation.md | 2 ++ core/deprecation.mk | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Deprecation.md b/Deprecation.md index 405a39e5b..0d925cbc5 100644 --- a/Deprecation.md +++ b/Deprecation.md @@ -18,9 +18,11 @@ have any problems converting, please contact us via: | `BUILD_AUX_STATIC_LIBRARY` | Warning | | `BUILD_HOST_FUZZ_TEST` | Warning | | `BUILD_HOST_NATIVE_TEST` | Warning | +| `BUILD_HOST_SHARED_TEST_LIBRARY` | Error | | `BUILD_HOST_STATIC_TEST_LIBRARY` | Warning | | `BUILD_HOST_TEST_CONFIG` | Error | | `BUILD_NATIVE_BENCHMARK` | Warning | +| `BUILD_SHARED_TEST_LIBRARY` | Error | | `BUILD_STATIC_TEST_LIBRARY` | Warning | | `BUILD_TARGET_TEST_CONFIG` | Error | | `BUILD_*` | Available | diff --git a/core/deprecation.mk b/core/deprecation.mk index 0b668ac97..11fe290bd 100644 --- a/core/deprecation.mk +++ b/core/deprecation.mk @@ -10,7 +10,6 @@ AVAILABLE_BUILD_MODULE_TYPES :=$= \ BUILD_HOST_JAVA_LIBRARY \ BUILD_HOST_PREBUILT \ BUILD_HOST_SHARED_LIBRARY \ - BUILD_HOST_SHARED_TEST_LIBRARY \ BUILD_HOST_STATIC_LIBRARY \ BUILD_JAVA_LIBRARY \ BUILD_MULTI_PREBUILT \ @@ -21,7 +20,6 @@ AVAILABLE_BUILD_MODULE_TYPES :=$= \ BUILD_PREBUILT \ BUILD_RRO_PACKAGE \ BUILD_SHARED_LIBRARY \ - BUILD_SHARED_TEST_LIBRARY \ BUILD_STATIC_JAVA_LIBRARY \ BUILD_STATIC_LIBRARY \ @@ -48,6 +46,8 @@ DEFAULT_ERROR_BUILD_MODULE_TYPES :=$= \ # These are BUILD_* variables that are always errors to reference. # Setting the BUILD_BROKEN_USES_BUILD_* variables is also an error. OBSOLETE_BUILD_MODULE_TYPES :=$= \ + BUILD_HOST_SHARED_TEST_LIBRARY \ + BUILD_SHARED_TEST_LIBRARY \ $(foreach m,$(OBSOLETE_BUILD_MODULE_TYPES),\ $(KATI_obsolete_var $(m),Please convert to Soong) \