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

Commit ecabf85f authored by Bruce Beare's avatar Bruce Beare Committed by David 'Digit' Turner
Browse files

Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures 



Orig-Change-Id: I5c1010d9caaa8d9ffaf65999fa3649c3c2be8caa
Signed-off-by: default avatarBruce Beare <bruce.j.beare@intel.com>
parent f7e4141f

core/config.mk

+8 −0
Original line number Diff line number Diff line
@@ -142,6 +142,14 @@ include $(board_config_mk) 
TARGET_DEVICE_DIR := $(patsubst %/,%,$(dir $(board_config_mk)))

board_config_mk :=



# This is the standard way to name a directory containing prebuilt target

# objects. E.g., prebuilt/$(TARGET_PREBUILT_TAG)/libc.so

ifeq ($(TARGET_SIMULATOR),true)

  TARGET_PREBUILT_TAG := $(TARGET_OS)-$(TARGET_ARCH)

else

  TARGET_PREBUILT_TAG := android-$(TARGET_ARCH)

endif



include $(BUILD_SYSTEM)/dumpvar.mk



# Clean up/verify variables defined by the board config file.

core/envsetup.mk

+0 −8
Original line number Diff line number Diff line
@@ -158,14 +158,6 @@ ifneq ($(TARGET_BUILD_TYPE),debug) 
TARGET_BUILD_TYPE := release

endif



# This is the standard way to name a directory containing prebuilt target

# objects. E.g., prebuilt/$(TARGET_PREBUILT_TAG)/libc.so

ifeq ($(TARGET_SIMULATOR),true)

  TARGET_PREBUILT_TAG := $(TARGET_OS)-$(TARGET_ARCH)

else

  TARGET_PREBUILT_TAG := android-$(TARGET_ARCH)

endif



# ---------------------------------------------------------------

# figure out the output directories