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

Commit 89631ffa authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Use pretty-error in prebuilt_internal.mk" am: 7ef5d750 am: ce394e47 

am: 5388fc85

Change-Id: I286dae3807b0878ed2611c2d3d9f4d6b6f4322d1
parents 565615f3 5388fc85

core/prebuilt_internal.mk

+6 −6
Original line number Diff line number Diff line
@@ -9,13 +9,13 @@ 
include $(BUILD_SYSTEM)/use_lld_setup.mk



ifneq ($(LOCAL_PREBUILT_LIBS),)

$(error dont use LOCAL_PREBUILT_LIBS anymore LOCAL_PATH=$(LOCAL_PATH))

$(call pretty-error,dont use LOCAL_PREBUILT_LIBS anymore)

endif

ifneq ($(LOCAL_PREBUILT_EXECUTABLES),)

$(error dont use LOCAL_PREBUILT_EXECUTABLES anymore LOCAL_PATH=$(LOCAL_PATH))

$(call pretty-error,dont use LOCAL_PREBUILT_EXECUTABLES anymore)

endif

ifneq ($(LOCAL_PREBUILT_JAVA_LIBRARIES),)

$(error dont use LOCAL_PREBUILT_JAVA_LIBRARIES anymore LOCAL_PATH=$(LOCAL_PATH))

$(call pretty-error,dont use LOCAL_PREBUILT_JAVA_LIBRARIES anymore)

endif



my_32_64_bit_suffix := $(if $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)IS_64_BIT),64,32)
@@ -125,13 +125,13 @@ endif 


ifneq ($(filter true keep_symbols no_debuglink mini-debug-info,$(my_strip_module)),)

  ifdef LOCAL_IS_HOST_MODULE

    $(error Cannot strip/pack host module LOCAL_PATH=$(LOCAL_PATH))

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

  endif

  ifeq ($(filter SHARED_LIBRARIES EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),)

    $(error Can strip/pack only shared libraries or executables LOCAL_PATH=$(LOCAL_PATH))

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

  endif

  ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),)

    $(error Cannot strip/pack scripts LOCAL_PATH=$(LOCAL_PATH))

    $(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)