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

Commit 1607ba1c authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 554eeb6c: am 493306f7: Merge "Fix TARGET_PREBUILT_TAG so that get_build_var... 

am 554eeb6c: am 493306f7: Merge "Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures"

* commit '554eeb6c':
  Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures
parents 2248e680 554eeb6c

core/config.mk

+8 −0
Original line number Diff line number Diff line
@@ -360,4 +360,12 @@ TARGET_AVAILABLE_NDK_VERSIONS := $(call numerically_sort,\ 


INTERNAL_PLATFORM_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/public_api.xml



# 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

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