From 3b40e3235936069657e89061852ef0cc9ddef779 Mon Sep 17 00:00:00 2001
From: Jerry Belton <jcecil@google.com>
Date: Mon, 13 May 2019 20:06:49 +0000
Subject: [PATCH] [sdk] Added dist_dir property to the sysroot SDK atom.
Bug: DX-538
Testing:
* sdk archive builds correctly.
* workspace generated properly
* tests pass as long as I use the same version of bazel that infra uses (0.17.2)
Change-Id: I808d1e6ca9d66b56ba6ad8f2e3a06270fd49c79d
---
build/sdk/meta/sysroot.json | 7 ++++++-
zircon/public/sysroot/BUILD.gn | 2 ++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/build/sdk/meta/sysroot.json b/build/sdk/meta/sysroot.json
index 1ea907aad48..ee4406496fd 100644
--- a/build/sdk/meta/sysroot.json
+++ b/build/sdk/meta/sysroot.json
@@ -69,6 +69,10 @@
"$ref": "common.json#/definitions/file"
}
},
+ "dist_dir": {
+ "description": "Path to the base directory for prebuilt libraries",
+ "$ref": "common.json#/definitions/file"
+ },
"include_dir": {
"description": "Path to the base directory for includes",
"$ref": "common.json#/definitions/file"
@@ -101,7 +105,8 @@
"include_dir",
"link_libs",
"dist_libs",
- "debug_libs"
+ "debug_libs",
+ "dist_dir"
],
"additionalProperties": false
}
diff --git a/zircon/public/sysroot/BUILD.gn b/zircon/public/sysroot/BUILD.gn
index b46d3f52eb2..9a80f2eee76 100644
--- a/zircon/public/sysroot/BUILD.gn
+++ b/zircon/public/sysroot/BUILD.gn
@@ -17,6 +17,7 @@ version_content = {
root = file_base
include_dir = "$file_base/include"
+ dist_dir = ""
headers = []
link_libs = []
dist_libs = []
@@ -75,6 +76,7 @@ foreach(entry, zircon_legacy_sysroot) {
} else if (defined(sdk.dist)) {
file = "$sysroot_dir/${sdk.dist}"
version_content.dist_libs += [ "$file_base/${sdk.dist}" ]
+ version_content.dist_dir = file_base
sdk_files += [
{
source = rebase_path(sdk.source, "", zircon_root_build_dir)
--
GitLab