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

Commit 710c3cb5 authored by Colin Cross's avatar Colin Cross
Browse files

Remove code related to unused LOCAL_* variables 

LOCAL_JETIFIER_ENABLED, LOCAL_NO_PIC, LOCAL_PREBUILT_STRIP_COMMENTS,
LOCAL_RMTYPEDEFS, and *.vts sources are never used.  Remove them
and the code related to them.

Test: no change to out/build-aosp_cf_x86_64_phone.ninja
Change-Id: I2ca9e674602057cc163b8bc28b0c57a0b7cc4361
parent fda3c6a3

core/binary.mk

+7 −9
Original line number Diff line number Diff line
@@ -354,7 +354,6 @@ endif 
# MinGW spits out warnings about -fPIC even for -fpie?!) being ignored because

# all code is position independent, and then those warnings get promoted to

# errors.

ifneq ($(LOCAL_NO_PIC),true)

ifneq ($(filter EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),)

  my_cflags += -fPIE

  ifndef BUILD_HOST_static
@@ -365,7 +364,6 @@ ifneq ($(LOCAL_NO_PIC),true) 
else

  my_cflags += -fPIC

endif

endif



ifdef LOCAL_IS_HOST_MODULE

my_src_files += $(LOCAL_SRC_FILES_$($(my_prefix)OS)) $(LOCAL_SRC_FILES_$($(my_prefix)OS)_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))

core/cc_prebuilt_internal.mk

+0 −3
Original line number Diff line number Diff line
@@ -56,9 +56,6 @@ ifneq ($(filter true keep_symbols no_debuglink mini-debug-info,$(my_strip_module 
  ifeq ($(filter SHARED_LIBRARIES EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),)

    $(call pretty-error,Can strip/pack only shared libraries or executables)

  endif

  ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),)

    $(call pretty-error,Cannot strip/pack scripts)

  endif

  # Set the arch-specific variables to set up the strip rules

  LOCAL_STRIP_MODULE_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH) := $(my_strip_module)

  include $(BUILD_SYSTEM)/dynamic_binary.mk

core/clear_vars.mk

+0 −6
Original line number Diff line number Diff line
@@ -133,7 +133,6 @@ LOCAL_JAVA_LANGUAGE_VERSION:= 
LOCAL_JAVA_LIBRARIES:=

LOCAL_JAVA_RESOURCE_DIRS:=

LOCAL_JAVA_RESOURCE_FILES:=

LOCAL_JETIFIER_ENABLED:=

LOCAL_JNI_SHARED_LIBRARIES:=

LOCAL_JNI_SHARED_LIBRARIES_ABI:=

LOCAL_CERTIFICATE_LINEAGE:=
@@ -177,7 +176,6 @@ LOCAL_NO_CRT:= 
LOCAL_NO_DEFAULT_COMPILER_FLAGS:=

LOCAL_NO_LIBCRT_BUILTINS:=

LOCAL_NO_NOTICE_FILE:=

LOCAL_NO_PIC:=

LOCAL_NOSANITIZE:=

LOCAL_NO_STANDARD_LIBRARIES:=

LOCAL_NO_STATIC_ANALYZER:=
@@ -203,7 +201,6 @@ LOCAL_PREBUILT_LIBS:= 
LOCAL_PREBUILT_MODULE_FILE:=

LOCAL_PREBUILT_OBJ_FILES:=

LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES:=

LOCAL_PREBUILT_STRIP_COMMENTS:=

LOCAL_USE_EMBEDDED_DEX:=

LOCAL_USE_EMBEDDED_NATIVE_LIBS:=

LOCAL_PRESUBMIT_DISABLED:=
@@ -239,7 +236,6 @@ LOCAL_REQUIRED_MODULES:= 
LOCAL_RES_LIBRARIES:=

LOCAL_RESOURCE_DIR:=

LOCAL_RLIB_LIBRARIES:=

LOCAL_RMTYPEDEFS:=

LOCAL_ROTATION_MIN_SDK_VERSION:=

LOCAL_RUNTIME_LIBRARIES:=

LOCAL_RRO_THEME:=
@@ -313,8 +309,6 @@ LOCAL_USES_LIBRARIES:= 
LOCAL_VENDOR_MODULE:=

LOCAL_VINTF_FRAGMENTS:=

LOCAL_VNDK_DEPEND_ON_CORE_VARIANT:=

LOCAL_VTS_INCLUDES:=

LOCAL_VTS_MODE:=

LOCAL_WARNINGS_ENABLE:=

LOCAL_WHOLE_STATIC_LIBRARIES:=

LOCAL_YACCFLAGS:=

core/definitions.mk

+0 −14
Original line number Diff line number Diff line
@@ -3243,14 +3243,6 @@ $(hide) rm -f $@ 
$(hide) cp -p "$<" "$@"

endef



# The same as copy-file-to-target, but strip out "# comment"-style

# comments (for config files and such).

define copy-file-to-target-strip-comments

@mkdir -p $(dir $@)

$(hide) rm -f $@

$(hide) sed -e 's/#.*$$//' -e 's/[ \t]*$$//' -e '/^$$/d' < $< > $@

endef



# The same as copy-file-to-target, but don't preserve

# the old modification time.

define copy-file-to-new-target
@@ -3285,12 +3277,6 @@ define transform-prebuilt-to-target 
$(copy-file-to-target)

endef



# Copy a prebuilt file to a target location, stripping "# comment" comments.

define transform-prebuilt-to-target-strip-comments

@echo "$($(PRIVATE_PREFIX)DISPLAY) Prebuilt: $(PRIVATE_MODULE) ($@)"

$(copy-file-to-target-strip-comments)

endef



# Copy a prebuilt file to a target location, but preserve symlinks rather than

# dereference them.

define copy-or-link-prebuilt-to-target

core/java_common.mk

+0 −2
Original line number Diff line number Diff line
@@ -238,8 +238,6 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_HAS_RS_SOURCES := 
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAVA_SOURCES := $(all_java_sources)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAVA_SOURCE_LIST := $(java_source_list_file)



$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_RMTYPEDEFS := $(LOCAL_RMTYPEDEFS)



# Quickly check class path vars.

disallowed_deps := $(foreach sdk,$(TARGET_AVAILABLE_SDK_VERSIONS),$(call resolve-prebuilt-sdk-module,$(sdk)))

disallowed_deps += $(foreach sdk,$(TARGET_AVAILABLE_SDK_VERSIONS),\