diff --git a/build/sdk/meta/sysroot.json b/build/sdk/meta/sysroot.json index 1ea907aad484d446239431d4644c5c09fc524aca..ee4406496fdb2810fda2fedcf939af028d21fe04 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 b46d3f52eb28f5cd6f1c19289d6986fbc63ad4c7..9a80f2eee767eebd160f96647e234cea4904cd7a 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)