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

Commit efee0692 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Obsolete unused module types 

These were deprecated in R, which has now branched, and there aren't any
users on master.

Test: build-aosp_crosshatch.ninja is identical
Test: treehugger
Change-Id: I6286880e45c0facbae56f9a16e8cfcbde12f121c
parent 58634e14

Deprecation.md

+7 −7
Original line number Diff line number Diff line
@@ -18,17 +18,17 @@ have any problems converting, please contact us via: 
| `BUILD_AUX_STATIC_LIBRARY`       | Obsolete  |

| `BUILD_COPY_HEADERS`             | Error     |

| `BUILD_HOST_EXECUTABLE`          | Error     |

| `BUILD_HOST_FUZZ_TEST`           | Error     |

| `BUILD_HOST_NATIVE_TEST`         | Error     |

| `BUILD_HOST_FUZZ_TEST`           | Obsolete  |

| `BUILD_HOST_NATIVE_TEST`         | Obsolete  |

| `BUILD_HOST_SHARED_LIBRARY`      | Error     |

| `BUILD_HOST_SHARED_TEST_LIBRARY` | Obsolete  |

| `BUILD_HOST_STATIC_LIBRARY`      | Error     |

| `BUILD_HOST_STATIC_TEST_LIBRARY` | Error     |

| `BUILD_HOST_TEST_CONFIG`         | Error     |

| `BUILD_NATIVE_BENCHMARK`         | Error     |

| `BUILD_HOST_STATIC_TEST_LIBRARY` | Obsolete  |

| `BUILD_HOST_TEST_CONFIG`         | Obsolete  |

| `BUILD_NATIVE_BENCHMARK`         | Obsolete  |

| `BUILD_SHARED_TEST_LIBRARY`      | Obsolete  |

| `BUILD_STATIC_TEST_LIBRARY`      | Error     |

| `BUILD_TARGET_TEST_CONFIG`       | Error     |

| `BUILD_STATIC_TEST_LIBRARY`      | Obsolete  |

| `BUILD_TARGET_TEST_CONFIG`       | Obsolete  |

| `BUILD_*`                        | Available |



## Module Type Deprecation Process

core/clear_vars.mk

+0 −1
Original line number Diff line number Diff line
@@ -293,7 +293,6 @@ LOCAL_STRIP_MODULE:= 
LOCAL_SYSTEM_SHARED_LIBRARIES:=none

LOCAL_TARGET_REQUIRED_MODULES:=

LOCAL_TEST_CONFIG:=

LOCAL_TEST_CONFIG_OPTIONS:=

LOCAL_TEST_DATA:=

LOCAL_TEST_MODULE_TO_PROGUARD_WITH:=

LOCAL_TIDY:=

core/config.mk

+1 −11
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ $(KATI_obsolete_var \ 
  LOCAL_CUSTOM_BUILD_STEP_OUTPUT \

  LOCAL_IS_AUX_MODULE \

  ,AUX support has been removed)

$(KATI_obsolete_var HOST_OUT_TEST_CONFIG TARGET_OUT_TEST_CONFIG LOCAL_TEST_CONFIG_OPTIONS)



# Used to force goals to build.  Only use for conditionally defined goals.

.PHONY: FORCE
@@ -196,23 +197,12 @@ BUILD_STATIC_JAVA_LIBRARY :=$= $(BUILD_SYSTEM)/static_java_library.mk 
BUILD_HOST_JAVA_LIBRARY :=$= $(BUILD_SYSTEM)/host_java_library.mk

BUILD_COPY_HEADERS :=$= $(BUILD_SYSTEM)/copy_headers.mk

BUILD_NATIVE_TEST :=$= $(BUILD_SYSTEM)/native_test.mk

BUILD_NATIVE_BENCHMARK :=$= $(BUILD_SYSTEM)/native_benchmark.mk

BUILD_HOST_NATIVE_TEST :=$= $(BUILD_SYSTEM)/host_native_test.mk

BUILD_FUZZ_TEST :=$= $(BUILD_SYSTEM)/fuzz_test.mk

BUILD_HOST_FUZZ_TEST :=$= $(BUILD_SYSTEM)/host_fuzz_test.mk



BUILD_SHARED_TEST_LIBRARY :=$= $(BUILD_SYSTEM)/shared_test_lib.mk

BUILD_HOST_SHARED_TEST_LIBRARY :=$= $(BUILD_SYSTEM)/host_shared_test_lib.mk

BUILD_STATIC_TEST_LIBRARY :=$= $(BUILD_SYSTEM)/static_test_lib.mk

BUILD_HOST_STATIC_TEST_LIBRARY :=$= $(BUILD_SYSTEM)/host_static_test_lib.mk



BUILD_NOTICE_FILE :=$= $(BUILD_SYSTEM)/notice_files.mk

BUILD_HOST_DALVIK_JAVA_LIBRARY :=$= $(BUILD_SYSTEM)/host_dalvik_java_library.mk

BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY :=$= $(BUILD_SYSTEM)/host_dalvik_static_java_library.mk



BUILD_HOST_TEST_CONFIG :=$= $(BUILD_SYSTEM)/host_test_config.mk

BUILD_TARGET_TEST_CONFIG :=$= $(BUILD_SYSTEM)/target_test_config.mk



include $(BUILD_SYSTEM)/deprecation.mk



# ###############################################################

core/deprecation.mk

+7 −7
Original line number Diff line number Diff line
@@ -31,23 +31,23 @@ DEFAULT_WARNING_BUILD_MODULE_TYPES :=$= \ 
DEFAULT_ERROR_BUILD_MODULE_TYPES :=$= \

  BUILD_COPY_HEADERS \

  BUILD_HOST_EXECUTABLE \

  BUILD_HOST_FUZZ_TEST \

  BUILD_HOST_NATIVE_TEST \

  BUILD_HOST_SHARED_LIBRARY \

  BUILD_HOST_STATIC_LIBRARY \

  BUILD_HOST_STATIC_TEST_LIBRARY \

  BUILD_HOST_TEST_CONFIG \

  BUILD_NATIVE_BENCHMARK \

  BUILD_STATIC_TEST_LIBRARY \

  BUILD_TARGET_TEST_CONFIG \



# These are BUILD_* variables that are always errors to reference.

# Setting the BUILD_BROKEN_USES_BUILD_* variables is also an error.

OBSOLETE_BUILD_MODULE_TYPES :=$= \

  BUILD_AUX_EXECUTABLE \

  BUILD_AUX_STATIC_LIBRARY \

  BUILD_HOST_FUZZ_TEST \

  BUILD_HOST_NATIVE_TEST \

  BUILD_HOST_SHARED_TEST_LIBRARY \

  BUILD_HOST_STATIC_TEST_LIBRARY \

  BUILD_HOST_TEST_CONFIG \

  BUILD_NATIVE_BENCHMARK \

  BUILD_SHARED_TEST_LIBRARY \

  BUILD_STATIC_TEST_LIBRARY \

  BUILD_TARGET_TEST_CONFIG \



$(foreach m,$(OBSOLETE_BUILD_MODULE_TYPES),\

  $(KATI_obsolete_var $(m),Please convert to Soong) \

core/envsetup.mk

+1 −6
Original line number Diff line number Diff line
@@ -375,9 +375,6 @@ HOST_OUT_COMMON_GEN := $(HOST_COMMON_OUT_ROOT)/gen 
HOST_CROSS_OUT_GEN := $(HOST_CROSS_OUT)/gen

.KATI_READONLY := HOST_CROSS_OUT_GEN



HOST_OUT_TEST_CONFIG := $(HOST_OUT)/test_config

.KATI_READONLY := HOST_OUT_TEST_CONFIG



# Out for HOST_2ND_ARCH

$(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_INTERMEDIATES := $(HOST_OUT)/obj32

$(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_SHARED_LIBRARIES := $(HOST_OUT)/lib
@@ -463,7 +460,6 @@ TARGET_OUT_ETC := $(TARGET_OUT)/etc 
TARGET_OUT_NOTICE_FILES := $(TARGET_OUT_INTERMEDIATES)/NOTICE_FILES

TARGET_OUT_FAKE := $(PRODUCT_OUT)/fake_packages

TARGET_OUT_TESTCASES := $(PRODUCT_OUT)/testcases

TARGET_OUT_TEST_CONFIG := $(PRODUCT_OUT)/test_config

.KATI_READONLY := \

  TARGET_OUT_EXECUTABLES \

  TARGET_OUT_OPTIONAL_EXECUTABLES \
@@ -477,8 +473,7 @@ TARGET_OUT_TEST_CONFIG := $(PRODUCT_OUT)/test_config 
  TARGET_OUT_ETC \

  TARGET_OUT_NOTICE_FILES \

  TARGET_OUT_FAKE \

  TARGET_OUT_TESTCASES \

  TARGET_OUT_TEST_CONFIG

  TARGET_OUT_TESTCASES



ifeq ($(SANITIZE_LITE),true)

# When using SANITIZE_LITE, APKs must not be packaged with sanitized libraries, as they will not