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

Commit 437ecb18 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Deprecate BUILD_HOST_SHARED_LIBRARY" am: 9fe24798 am: e2b3e1a8 

Change-Id: Iafa86c91dc916fee8f1ecae680b40d6fc9a9d87e
parents 18201fab e2b3e1a8

Deprecation.md

+1 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ have any problems converting, please contact us via: 
| `BUILD_AUX_STATIC_LIBRARY`       | Error     |

| `BUILD_AUX_STATIC_LIBRARY`       | Error     |

| `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_TEST_LIBRARY` | Error     |

| `BUILD_HOST_SHARED_TEST_LIBRARY` | Error     |

| `BUILD_HOST_STATIC_LIBRARY`      | Warning   |

| `BUILD_HOST_STATIC_LIBRARY`      | Warning   |

| `BUILD_HOST_STATIC_TEST_LIBRARY` | Error     |

| `BUILD_HOST_STATIC_TEST_LIBRARY` | Error     |

core/deprecation.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -9,7 +9,6 @@ AVAILABLE_BUILD_MODULE_TYPES :=$= \ 
  BUILD_HOST_EXECUTABLE \

  BUILD_HOST_EXECUTABLE \

  BUILD_HOST_JAVA_LIBRARY \

  BUILD_HOST_JAVA_LIBRARY \

  BUILD_HOST_PREBUILT \

  BUILD_HOST_PREBUILT \

  BUILD_HOST_SHARED_LIBRARY \

  BUILD_JAVA_LIBRARY \

  BUILD_JAVA_LIBRARY \

  BUILD_MULTI_PREBUILT \

  BUILD_MULTI_PREBUILT \

  BUILD_NATIVE_TEST \

  BUILD_NATIVE_TEST \
@@ -27,6 +26,7 @@ AVAILABLE_BUILD_MODULE_TYPES :=$= \ 
# relevant BUILD_BROKEN_USES_BUILD_* variables, then these would move to

# relevant BUILD_BROKEN_USES_BUILD_* variables, then these would move to

# DEFAULT_ERROR_BUILD_MODULE_TYPES.

# DEFAULT_ERROR_BUILD_MODULE_TYPES.

DEFAULT_WARNING_BUILD_MODULE_TYPES :=$= \

DEFAULT_WARNING_BUILD_MODULE_TYPES :=$= \

  BUILD_HOST_SHARED_LIBRARY \

  BUILD_HOST_STATIC_LIBRARY \

  BUILD_HOST_STATIC_LIBRARY \





# These are BUILD_* variables that are errors to reference, but you can set

# These are BUILD_* variables that are errors to reference, but you can set

core/shared_library.mk

+3 −0
Original line number Original line Diff line number Diff line 
$(call record-module-type,SHARED_LIBRARY)

$(call record-module-type,SHARED_LIBRARY)

ifdef LOCAL_IS_HOST_MODULE

  $(call pretty-error,BUILD_SHARED_LIBRARY is incompatible with LOCAL_IS_HOST_MODULE. Use BUILD_HOST_SHARED_LIBRARY instead.)

endif

my_prefix := TARGET_

my_prefix := TARGET_

include $(BUILD_SYSTEM)/multilib.mk

include $(BUILD_SYSTEM)/multilib.mk

core/static_library.mk

+3 −0
Original line number Original line Diff line number Diff line 
$(call record-module-type,STATIC_LIBRARY)

$(call record-module-type,STATIC_LIBRARY)

ifdef LOCAL_IS_HOST_MODULE

  $(call pretty-error,BUILD_STATIC_LIBRARY is incompatible with LOCAL_IS_HOST_MODULE. Use BUILD_HOST_STATIC_LIBRARY instead)

endif

my_prefix := TARGET_

my_prefix := TARGET_

include $(BUILD_SYSTEM)/multilib.mk

include $(BUILD_SYSTEM)/multilib.mk