From 28bc9698ef99080a79f615d8fe93fd935fc506f6 Mon Sep 17 00:00:00 2001 From: Pirama Arumuga Nainar Date: Tue, 15 Jun 2021 09:51:00 -0700 Subject: [PATCH] Mark more fields in BaseLinkerProperties as arch variant Bug: http://b/189438896 This allows setting a different version script for vendor and platform variants. Test: The following blueprint snippet builds: target: { android_arm64: { target: vendor: { version_script: "..." } } } (cherry picked from commit 250c5217a264fb3bd53f02339d0b382d70da3fee) Change-Id: Id0df2e89f87fb2b19e71d529cf00727e6b80b1c7 Merged-In: I47e7afeaee3c9124f4231bf0eece7b6844b5313d --- cc/linker.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cc/linker.go b/cc/linker.go index 5bd21eda3..449b9ad96 100644 --- a/cc/linker.go +++ b/cc/linker.go @@ -122,7 +122,7 @@ type BaseLinkerProperties struct { // version script for vendor or product variant Version_script *string `android:"arch_variant"` - } + } `android:"arch_variant"` Recovery struct { // list of shared libs that only should be used to build the recovery // variant of the C/C++ module. @@ -182,7 +182,7 @@ type BaseLinkerProperties struct { // variant of the C/C++ module. Exclude_static_libs []string } - } + } `android:"arch_variant"` // make android::build:GetBuildNumber() available containing the build ID. Use_version_lib *bool `android:"arch_variant"`