diff options
| author | 2020-01-29 13:24:21 -0800 | |
|---|---|---|
| committer | 2020-01-29 13:27:18 -0800 | |
| commit | 4c3a01f105e399f754350db1b57e78e237e7135b (patch) | |
| tree | 460ca53e5a629d8fc4f2577ec2ae5f9601e416cd | |
| parent | 5c3725510a349d0492b341bd2b4efe8a06bc43a7 (diff) | |
Mark BUILD_HOST_EXECUTABLE as deprecated
The last common user has been removed
Bug: 130696912
Test: treehugger
Change-Id: I7920719edfdef295f4136326445836053db5adf8
| -rw-r--r-- | Deprecation.md | 1 | ||||
| -rw-r--r-- | core/deprecation.mk | 2 | ||||
| -rw-r--r-- | core/executable.mk | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/Deprecation.md b/Deprecation.md index 7046a74785..5e26492708 100644 --- a/Deprecation.md +++ b/Deprecation.md @@ -17,6 +17,7 @@ have any problems converting, please contact us via: | `BUILD_AUX_EXECUTABLE` | Error | | `BUILD_AUX_STATIC_LIBRARY` | Error | | `BUILD_COPY_HEADERS` | Warning | +| `BUILD_HOST_EXECUTABLE` | Warning | | `BUILD_HOST_FUZZ_TEST` | Error | | `BUILD_HOST_NATIVE_TEST` | Error | | `BUILD_HOST_SHARED_LIBRARY` | Warning | diff --git a/core/deprecation.mk b/core/deprecation.mk index dac7e4bca5..cc620a32d3 100644 --- a/core/deprecation.mk +++ b/core/deprecation.mk @@ -5,7 +5,6 @@ AVAILABLE_BUILD_MODULE_TYPES :=$= \ BUILD_HEADER_LIBRARY \ BUILD_HOST_DALVIK_JAVA_LIBRARY \ BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY \ - BUILD_HOST_EXECUTABLE \ BUILD_HOST_JAVA_LIBRARY \ BUILD_HOST_PREBUILT \ BUILD_JAVA_LIBRARY \ @@ -26,6 +25,7 @@ AVAILABLE_BUILD_MODULE_TYPES :=$= \ # DEFAULT_ERROR_BUILD_MODULE_TYPES. DEFAULT_WARNING_BUILD_MODULE_TYPES :=$= \ BUILD_COPY_HEADERS \ + BUILD_HOST_EXECUTABLE \ BUILD_HOST_SHARED_LIBRARY \ BUILD_HOST_STATIC_LIBRARY \ diff --git a/core/executable.mk b/core/executable.mk index c8d9272627..db8dcc6318 100644 --- a/core/executable.mk +++ b/core/executable.mk @@ -6,6 +6,10 @@ # LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64 or LOCAL_MODULE_STEM_32 and # LOCAL_MODULE_STEM_64 +ifdef LOCAL_IS_HOST_MODULE + $(call pretty-error,BUILD_EXECUTABLE is incompatible with LOCAL_IS_HOST_MODULE. Use BUILD_HOST_EXECUTABLE instead.) +endif + my_skip_this_target := ifneq ($(filter address,$(SANITIZE_TARGET)),) ifeq (true,$(LOCAL_FORCE_STATIC_EXECUTABLE)) |