ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes from topic "vndk-sp-list-update" am: 4c0ee1e8a0

Browse source 
am: 6edfca6e3b

Change-Id: I542fcb67e5a7aaef0f976d652a42902b0ff521cb
This commit is contained in:
Justin Yun 2018-02-08 06:11:06 +00:00 • committed by android-build-merger
commit 0d77d80aad
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
rootdir/Android.mk
View file

@ -192,10 +192,10 @@ endef # update_and_install_ld_config
# ld.config.txt # ld.config.txt
# #
# For VNDK enforced devices that have defined BOARD_VNDK_VERSION, use # For VNDK enforced devices that have defined BOARD_VNDK_VERSION, use
# "ld.config.vndk.txt" as a source file. This configuration includes # "ld.config.txt" as a source file. This configuration includes strict VNDK
# strict VNDK run-time restrictions for vendor process. # run-time restrictions for vendor process.
# Other treblized devices, that have not defined BOARD_VNDK_VERSION or that # Other treblized devices, that have not defined BOARD_VNDK_VERSION or that
# have set BOARD_VNDK_RUNTIME_DISABLE to true, use "ld.config.vndk_light.txt" # have set BOARD_VNDK_RUNTIME_DISABLE to true, use "ld.config.vndk_lite.txt"
# as a source file. This configuration does not have strict VNDK run-time # as a source file. This configuration does not have strict VNDK run-time
# restrictions. # restrictions.
# If the device is not treblized, use "ld.config.legacy.txt" for legacy # If the device is not treblized, use "ld.config.legacy.txt" for legacy
@ -217,7 +217,7 @@ ifeq ($(_enforce_vndk_at_runtime),true)
LOCAL_MODULE_STEM := $(call append_vndk_version,$(LOCAL_MODULE)) LOCAL_MODULE_STEM := $(call append_vndk_version,$(LOCAL_MODULE))
include $(BUILD_SYSTEM)/base_rules.mk include $(BUILD_SYSTEM)/base_rules.mk
$(eval $(call update_and_install_ld_config,\ $(eval $(call update_and_install_ld_config,\
$(LOCAL_PATH)/etc/ld.config.vndk.txt,\ $(LOCAL_PATH)/etc/ld.config.txt,\
$(LOCAL_BUILT_MODULE),\ $(LOCAL_BUILT_MODULE),\
$(PLATFORM_VNDK_VERSION))) $(PLATFORM_VNDK_VERSION)))
@ -226,7 +226,7 @@ else ifeq ($(PRODUCT_TREBLE_LINKER_NAMESPACES)|$(SANITIZE_TARGET),true|)
LOCAL_MODULE_STEM := $(call append_vndk_version,$(LOCAL_MODULE)) LOCAL_MODULE_STEM := $(call append_vndk_version,$(LOCAL_MODULE))
include $(BUILD_SYSTEM)/base_rules.mk include $(BUILD_SYSTEM)/base_rules.mk
$(eval $(call update_and_install_ld_config,\ $(eval $(call update_and_install_ld_config,\
$(LOCAL_PATH)/etc/ld.config.vndk_light.txt,\ $(LOCAL_PATH)/etc/ld.config.vndk_lite.txt,\
$(LOCAL_BUILT_MODULE),\ $(LOCAL_BUILT_MODULE),\
$(if $(BOARD_VNDK_VERSION),$(PLATFORM_VNDK_VERSION)))) $(if $(BOARD_VNDK_VERSION),$(PLATFORM_VNDK_VERSION))))
@ -245,9 +245,9 @@ _enforce_vndk_at_runtime :=
# #
# This file is a temporary configuration file only for GSI. Originally GSI has # This file is a temporary configuration file only for GSI. Originally GSI has
# BOARD_VNDK_VERSION defined and has strict VNDK enforcing rule based on # BOARD_VNDK_VERSION defined and has strict VNDK enforcing rule based on
# "ld.config.vndk.txt". However for the devices, that have not defined # "ld.config.txt". However for the devices, that have not defined
# BOARD_VNDK_VERSION, GSI provides this configuration file which is based on # BOARD_VNDK_VERSION, GSI provides this configuration file which is based on
# "ld.config.vndk_light.txt". # "ld.config.vndk_lite.txt".
# Do not install this file for the devices other than GSI. # Do not install this file for the devices other than GSI.
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := ld.config.noenforce.txt LOCAL_MODULE := ld.config.noenforce.txt
@ -256,7 +256,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
LOCAL_MODULE_STEM := $(LOCAL_MODULE) LOCAL_MODULE_STEM := $(LOCAL_MODULE)
include $(BUILD_SYSTEM)/base_rules.mk include $(BUILD_SYSTEM)/base_rules.mk
$(eval $(call update_and_install_ld_config,\ $(eval $(call update_and_install_ld_config,\
$(LOCAL_PATH)/etc/ld.config.vndk_light.txt,\ $(LOCAL_PATH)/etc/ld.config.vndk_lite.txt,\
$(LOCAL_BUILT_MODULE),\ $(LOCAL_BUILT_MODULE),\
$(PLATFORM_VNDK_VERSION))) $(PLATFORM_VNDK_VERSION)))

0
rootdir/etc/ld.config.vndk.txt → rootdir/etc/ld.config.txt
View file

0
rootdir/etc/ld.config.vndk_light.txt → rootdir/etc/ld.config.vndk_lite.txt
View file