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

Commit cecb32f2 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Deprecate next set of make module types" 

am: 2cfbde6f

Change-Id: I316acef9e09e909a255ef3dcbcea808023fabf4a
parents df24a30b 2cfbde6f

Deprecation.md

+12 −5
Original line number Diff line number Diff line
@@ -13,8 +13,15 @@ have any problems converting, please contact us via: 
[build/make/core/deprecation.mk] is the source of truth, but for easy browsing:



| Module type                      | State     |

| -------------------------- | --------- |

| -------------------------------- | --------- |

| `BUILD_AUX_EXECUTABLE`           | Warning   |

| `BUILD_AUX_STATIC_LIBRARY`       | Warning   |

| `BUILD_HOST_FUZZ_TEST`           | Warning   |

| `BUILD_HOST_NATIVE_TEST`         | Warning   |

| `BUILD_HOST_STATIC_TEST_LIBRARY` | Warning   |

| `BUILD_HOST_TEST_CONFIG`         | Error     |

| `BUILD_NATIVE_BENCHMARK`         | Warning   |

| `BUILD_STATIC_TEST_LIBRARY`      | Warning   |

| `BUILD_TARGET_TEST_CONFIG`       | Error     |

| `BUILD_*`                        | Available |

core/deprecation.mk

+7 −7
Original line number Diff line number Diff line 
# These module types can still be used without warnings or errors.

AVAILABLE_BUILD_MODULE_TYPES :=$= \

  BUILD_AUX_EXECUTABLE \

  BUILD_AUX_STATIC_LIBRARY \

  BUILD_COPY_HEADERS \

  BUILD_EXECUTABLE \

  BUILD_FUZZ_TEST \
@@ -9,17 +7,13 @@ AVAILABLE_BUILD_MODULE_TYPES :=$= \ 
  BUILD_HOST_DALVIK_JAVA_LIBRARY \

  BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY \

  BUILD_HOST_EXECUTABLE \

  BUILD_HOST_FUZZ_TEST \

  BUILD_HOST_JAVA_LIBRARY \

  BUILD_HOST_NATIVE_TEST \

  BUILD_HOST_PREBUILT \

  BUILD_HOST_SHARED_LIBRARY \

  BUILD_HOST_SHARED_TEST_LIBRARY \

  BUILD_HOST_STATIC_LIBRARY \

  BUILD_HOST_STATIC_TEST_LIBRARY \

  BUILD_JAVA_LIBRARY \

  BUILD_MULTI_PREBUILT \

  BUILD_NATIVE_BENCHMARK \

  BUILD_NATIVE_TEST \

  BUILD_NOTICE_FILE \

  BUILD_PACKAGE \
@@ -30,13 +24,19 @@ AVAILABLE_BUILD_MODULE_TYPES :=$= \ 
  BUILD_SHARED_TEST_LIBRARY \

  BUILD_STATIC_JAVA_LIBRARY \

  BUILD_STATIC_LIBRARY \

  BUILD_STATIC_TEST_LIBRARY \



# These are BUILD_* variables that will throw a warning when used. This is

# generally a temporary state until all the devices are marked with the

# relevant BUILD_BROKEN_USES_BUILD_* variables, then these would move to

# DEFAULT_ERROR_BUILD_MODULE_TYPES.

DEFAULT_WARNING_BUILD_MODULE_TYPES :=$= \

  BUILD_AUX_EXECUTABLE \

  BUILD_AUX_STATIC_LIBRARY \

  BUILD_HOST_FUZZ_TEST \

  BUILD_HOST_NATIVE_TEST \

  BUILD_HOST_STATIC_TEST_LIBRARY \

  BUILD_NATIVE_BENCHMARK \

  BUILD_STATIC_TEST_LIBRARY \



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

# BUILD_BROKEN_USES_BUILD_* in your BoardConfig.mk in order to turn them back

core/host_static_test_lib.mk

+1 −1
Original line number Diff line number Diff line
@@ -6,4 +6,4 @@ $(call record-module-type,HOST_STATIC_TEST_LIBRARY) 


include $(BUILD_SYSTEM)/host_test_internal.mk



include $(BUILD_HOST_STATIC_LIBRARY)
 
include $(BUILD_SYSTEM)/host_static_library.mk