tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
platform_build/core/local_vndk.mk

39 lines
1.3 KiB
Makefile
Raw Normal View History

Revert "Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set."" This reverts commit 823172e209ab92dbae6dd5a4ef750f73dbfc5aa8. Test: build.ninja for any target doesnt change, unless BOARD_VNDK_VERSION is turned on in BoardConfig.mk Change-Id: I4e1baaf5a2251de20f71a47096ce53e23d7e2d80
2016-12-20 18:50:21 +01:00
Add support for /odm partition This CL is largely an adaptation of Change-Id I5d229f6ac729ea6df9ff1f14cee2e28972cd9b4d tools/vendor_buildinfo.sh is also renamed to tools/device_buildinfo.sh. The caller then can invoke device_buildinfo.sh "vendor" | "odm" to generate properties for vendor.img and odm.img, respectively. It adds the following variables: - BOARD_AVB_ODM_KEY_PATH - BOARD_AVB_ODM_ALGORITHM - BOARD_AVB_ODM_ROLLBACK_INDEX_LOCATION - BOARD_ODMIMAGE_FILE_SYSTEM_TYPE - BOARD_ODMIMAGE_EXTFS_INODE_COUNT - BOARD_ODMIMAGE_EXTFS_RSV_PCT - BOARD_ODMIMAGE_PARTITION_SIZE - BOARD_ODMIMAGE_JOURNAL_SIZE - BOARD_ODMIMAGE_SQUASHFS_BLOCK_SIZE - BOARD_ODMIMAGE_SQUASHFS_COMPRESSOR - BOARD_ODMIMAGE_SQUASHFS_COMPRESSOR_OPT - BOARD_ODMIMAGE_SQUASHFS_DISABLE_4K_ALIGN - BOARD_PREBUILT_ODMIMAGE - BOARD_USES_ODMIMAGE - LOCAL_ODM_MODULE - PRODUCT_ODM_BASE_FS_PATH - PRODUCT_ODM_VERITY_PARTITION - PRODUCT_ODM_PROPERTIES - TARGET_COPY_OUT_ODM - TARGET_OUT_ODM - TARGET_OUT_ODM_* Bug: 64195575 Test: boot a Taimen with existing images Test: `make odmimage` with - BOARD_AVB_ENABLE := true - BOARD_ODMIMAGE_PARTITION_SIZE := 62914560 - BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := ext4 - TARGET_COPY_OUT_ODM := odm - PRODUCT_ODM_PROPERTIES += odm.test.build=success Test: `make odmimage` with - BOARD_ODMIMAGE_PARTITION_RESERVED_SIZE := 10485760 - BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := ext4 - BOARD_AVB_ENABLE := true - TARGET_COPY_OUT_ODM := odm - PRODUCT_ODM_PROPERTIES += odm.test.build=success - PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true Change-Id: I4dea7b567ec49a766c7a4683decaf81c7e921d55
2017-11-14 16:42:30 +01:00
#Set LOCAL_USE_VNDK for modules going into vendor or odm partition, except for host modules
Revert "Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set."" This reverts commit 823172e209ab92dbae6dd5a4ef750f73dbfc5aa8. Test: build.ninja for any target doesnt change, unless BOARD_VNDK_VERSION is turned on in BoardConfig.mk Change-Id: I4e1baaf5a2251de20f71a47096ce53e23d7e2d80
2016-12-20 18:50:21 +01:00
#If LOCAL_SDK_VERSION is set, thats a more restrictive set, so they dont need LOCAL_USE_VNDK
ifndef LOCAL_IS_HOST_MODULE
ifndef LOCAL_SDK_VERSION
LOCAL_PROPRIETARY_MODULE implies LOCAL_USE_VNDK Test: m -j -k BOARD_VNDK_VERSION=true Bug: 37342627 Change-Id: I6bb878eeb2a7b2cb4392fd60bc397e35ad51a6e2 Merged-In: I6bb878eeb2a7b2cb4392fd60bc397e35ad51a6e2
2017-06-21 00:06:39 +02:00
ifneq (,$(filter true,$(LOCAL_VENDOR_MODULE) $(LOCAL_ODM_MODULE) $(LOCAL_OEM_MODULE) $(LOCAL_PROPRIETARY_MODULE)))
Revert "Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set."" This reverts commit 823172e209ab92dbae6dd5a4ef750f73dbfc5aa8. Test: build.ninja for any target doesnt change, unless BOARD_VNDK_VERSION is turned on in BoardConfig.mk Change-Id: I4e1baaf5a2251de20f71a47096ce53e23d7e2d80
2016-12-20 18:50:21 +01:00
LOCAL_USE_VNDK:=true
Ensure partition_tag is always set correctly partition_tag is now set to either VENDOR_, OEM_, or ODM_ even when LOCAL_[VENDOR|OEM|ODM]_MODULE isn't set but LOCAL_MODULE_PATH is explicitly set to under $(TARGET_OUT_[VENDOR|OEM|ODM]). Test: build walleye Change-Id: I0f902061889fe0af1c39f6222e54faa80dd15794
2017-11-15 10:22:14 +01:00
# Note: no need to check LOCAL_MODULE_PATH* since LOCAL_[VENDOR|ODM|OEM]_MODULE is already
# set correctly before this is included.
Revert "Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set."" This reverts commit 823172e209ab92dbae6dd5a4ef750f73dbfc5aa8. Test: build.ninja for any target doesnt change, unless BOARD_VNDK_VERSION is turned on in BoardConfig.mk Change-Id: I4e1baaf5a2251de20f71a47096ce53e23d7e2d80
2016-12-20 18:50:21 +01:00
endif
endif
endif
Add basic VNDK support in Make Add BOARD_VNDK_VERSION and LOCAL_USE_VNDK to specify the version of the VNDK that will be used globally, and whether to use the VNDK on a module basis. If the board is using the VNDK: * LOCAL_COPY_HEADERS may only be used by modules defining LOCAL_USE_VNDK * LOCAL_USE_VNDK modules will compile against the NDK headers and stub libraries, but continue to use the platform libc++. * LOCAL_USE_VNDK modules will not have the global includes like system/core/include, but it will use device-specific kernel headers. This change does not attempt to enforce any linking constraints, that will come in a later patch. Test: out/build-aosp_arm.ninja is identical before/after Change-Id: Icce65d4974f085093d500b5b2516983788fe2905
2016-11-18 23:05:39 +01:00
# Verify LOCAL_USE_VNDK usage, and set LOCAL_SDK_VERSION if necessary
ifdef LOCAL_IS_HOST_MODULE
ifdef LOCAL_USE_VNDK
$(shell echo $(LOCAL_MODULE_MAKEFILE): $(LOCAL_MODULE): Do not use LOCAL_USE_VNDK with host modules >&2)
$(error done)
endif
endif
ifdef LOCAL_USE_VNDK
ifneq ($(LOCAL_USE_VNDK),true)
$(shell echo '$(LOCAL_MODULE_MAKEFILE): $(LOCAL_MODULE): LOCAL_USE_VNDK must be "true" or empty, not "$(LOCAL_USE_VNDK)"' >&2)
$(error done)
endif
ifdef LOCAL_SDK_VERSION
$(shell echo $(LOCAL_MODULE_MAKEFILE): $(LOCAL_MODULE): LOCAL_USE_VNDK must not be used with LOCAL_SDK_VERSION >&2)
$(error done)
endif
# If we're not using the VNDK, drop all restrictions
ifndef BOARD_VNDK_VERSION
LOCAL_USE_VNDK:=
endif
endif
Reference in a new issue Copy permalink