Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cba4486b authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Mark BUILD_HOST_EXECUTABLE as deprecated" am: e2e32f5d am: d67ff5cc 

Change-Id: I5fc349eda3993ddf89e6fa567554371ebbb5d091
parents c1a02678 d67ff5cc

Deprecation.md

+1 −0
Original line number Diff line number Diff line
@@ -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   |

core/deprecation.mk

+1 −1
Original line number Diff line number Diff line
@@ -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 \

core/executable.mk

+4 −0
Original line number Diff line number Diff line
@@ -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))