tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes Ib9d1863c,I2a6eb327

Browse source 
* changes:
  SDK targets should inherit from core_64_bit.mk
  Fix issue in symlinking 64 bit executables.
This commit is contained in:
Narayan Kamath 2014-06-19 09:59:47 +00:00 committed by Android (Google) Code Review
commit 6db9e1c887
4 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/executable_prefer_symlink.mk
View file

@ -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 # check because 32 bit targets may not define TARGET_PREFER_32_BIT_APPS
# et al. since those variables make no sense in that context. # et al. since those variables make no sense in that context.
ifeq ($(TARGET_IS_64_BIT),true) ifeq ($(TARGET_IS_64_BIT),true)
ifneq ($(TARGET_PREFER_32_BIT_APPS),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) $(my_symlink): PRIVATE_SRC_BINARY_NAME := $(LOCAL_MODULE_STEM_64)
else else
# We support only 32 bit apps.
$(my_symlink): PRIVATE_SRC_BINARY_NAME := $(LOCAL_MODULE_STEM_32) $(my_symlink): PRIVATE_SRC_BINARY_NAME := $(LOCAL_MODULE_STEM_32)
endif endif
else else

1
target/product/sdk_arm64.mk
View file

@ -20,6 +20,7 @@
# entirely appropriate to inherit from for on-device configurations. # 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/sdk.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
# Overrides # Overrides
PRODUCT_BRAND := generic_arm64 PRODUCT_BRAND := generic_arm64

1
target/product/sdk_mips64.mk
View file

@ -20,6 +20,7 @@
# entirely appropriate to inherit from for on-device configurations. # 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/sdk.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
# Overrides # Overrides
PRODUCT_BRAND := generic_mips64 PRODUCT_BRAND := generic_mips64

1
target/product/sdk_x86_64.mk
View file

@ -20,6 +20,7 @@
# entirely appropriate to inherit from for on-device configurations. # 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/sdk.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
# Overrides # Overrides
PRODUCT_BRAND := generic_x86_64 PRODUCT_BRAND := generic_x86_64