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

Commit 6db9e1c8 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android (Google) Code Review
Browse files

Merge changes Ib9d1863c,I2a6eb327 

* changes:
  SDK targets should inherit from core_64_bit.mk
  Fix issue in symlinking 64 bit executables.
parents 1e961acf e78ba32d

core/executable_prefer_symlink.mk

+12 −1
Original line number Diff line number Diff line
@@ -10,9 +10,20 @@ my_symlink := $(addprefix $(TARGET_OUT)/bin/, $(LOCAL_MODULE)) 
# check because 32 bit targets may not define TARGET_PREFER_32_BIT_APPS

# et al. since those variables make no sense in that context.

ifeq ($(TARGET_IS_64_BIT),true)

ifeq ($(TARGET_SUPPORTS_64_BIT_APPS)|$(TARGET_SUPPORTS_32_BIT_APPS),true|true)

  # We support both 32 and 64 bit apps, so we will have to

  # base our decision on whether the target prefers one or the

  # other.

  ifneq ($(TARGET_PREFER_32_BIT_APPS),true)

    $(my_symlink): PRIVATE_SRC_BINARY_NAME := $(LOCAL_MODULE_STEM_32)

  else

    $(my_symlink): PRIVATE_SRC_BINARY_NAME := $(LOCAL_MODULE_STEM_64)

  endif

else ifeq ($(TARGET_SUPPORTS_64_BIT_APPS),true)

  # We support only 64 bit apps.

  $(my_symlink): PRIVATE_SRC_BINARY_NAME := $(LOCAL_MODULE_STEM_64)

else

  # We support only 32 bit apps.

  $(my_symlink): PRIVATE_SRC_BINARY_NAME := $(LOCAL_MODULE_STEM_32)

endif

else

target/product/sdk_arm64.mk

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
# entirely appropriate to inherit from for on-device configurations.



$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)



# Overrides

PRODUCT_BRAND := generic_arm64

target/product/sdk_mips64.mk

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
# entirely appropriate to inherit from for on-device configurations.



$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)



# Overrides

PRODUCT_BRAND := generic_mips64

target/product/sdk_x86_64.mk

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
# entirely appropriate to inherit from for on-device configurations.



$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)



# Overrides

PRODUCT_BRAND := generic_x86_64