openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Mark BUILD_HOST_EXECUTABLE as deprecated" am: e2e32f5d27 

Change-Id: Ie6e325a82bb20e864417fc6a01f76d27499a7145
This commit is contained in:
Automerger Merge Worker 2020-01-30 17:45:22 +00:00
parent 46fe30f89c e2e32f5d27
commit d67ff5cc29
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Deprecation.md
View File

@ -17,6 +17,7 @@ have any problems converting, please contact us via:
| `BUILD_AUX_EXECUTABLE` | Error | | `BUILD_AUX_EXECUTABLE` | Error |
| `BUILD_AUX_STATIC_LIBRARY` | Error | | `BUILD_AUX_STATIC_LIBRARY` | Error |
| `BUILD_COPY_HEADERS` | Warning | | `BUILD_COPY_HEADERS` | Warning |
| `BUILD_HOST_EXECUTABLE` | Warning |
| `BUILD_HOST_FUZZ_TEST` | Error | | `BUILD_HOST_FUZZ_TEST` | Error |
| `BUILD_HOST_NATIVE_TEST` | Error | | `BUILD_HOST_NATIVE_TEST` | Error |
| `BUILD_HOST_SHARED_LIBRARY` | Warning | | `BUILD_HOST_SHARED_LIBRARY` | Warning |

2
core/deprecation.mk
View File

@ -5,7 +5,6 @@ AVAILABLE_BUILD_MODULE_TYPES :=$= \
BUILD_HEADER_LIBRARY \ BUILD_HEADER_LIBRARY \
BUILD_HOST_DALVIK_JAVA_LIBRARY \ BUILD_HOST_DALVIK_JAVA_LIBRARY \
BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY \ BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY \
BUILD_HOST_EXECUTABLE \
BUILD_HOST_JAVA_LIBRARY \ BUILD_HOST_JAVA_LIBRARY \
BUILD_HOST_PREBUILT \ BUILD_HOST_PREBUILT \
BUILD_JAVA_LIBRARY \ BUILD_JAVA_LIBRARY \
@ -26,6 +25,7 @@ AVAILABLE_BUILD_MODULE_TYPES :=$= \
# DEFAULT_ERROR_BUILD_MODULE_TYPES. # DEFAULT_ERROR_BUILD_MODULE_TYPES.
DEFAULT_WARNING_BUILD_MODULE_TYPES :=$= \ DEFAULT_WARNING_BUILD_MODULE_TYPES :=$= \
BUILD_COPY_HEADERS \ BUILD_COPY_HEADERS \
BUILD_HOST_EXECUTABLE \
BUILD_HOST_SHARED_LIBRARY \ BUILD_HOST_SHARED_LIBRARY \
BUILD_HOST_STATIC_LIBRARY \ BUILD_HOST_STATIC_LIBRARY \

4
core/executable.mk
View File

@ -6,6 +6,10 @@
# LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64 or LOCAL_MODULE_STEM_32 and # LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64 or LOCAL_MODULE_STEM_32 and
# LOCAL_MODULE_STEM_64 # 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 := my_skip_this_target :=
ifneq ($(filter address,$(SANITIZE_TARGET)),) ifneq ($(filter address,$(SANITIZE_TARGET)),)
ifeq (true,$(LOCAL_FORCE_STATIC_EXECUTABLE)) ifeq (true,$(LOCAL_FORCE_STATIC_EXECUTABLE))