[L] Change in fuchsia/fuchsia[main]: Reland "[merge][sdk] Change sysroot and cc_prebuilt_library to use ne...

[Jiaming Li (Gerrit)]

Attention is currently required from: Adam Barth, Chase Latta, Clayton Wilkinson, David Turner, Hunter Freyer.

Jiaming Li would like Clayton Wilkinson, Chase Latta, David Turner, Adam Barth, CQ Bot, Rubber Stamper (Chrome), Hunter Freyer and RubberStamper 🤖 to review this change.

View Change

Reland "[merge][sdk] Change sysroot and cc_prebuilt_library to use new schema"

This reverts commit 35f689234f3fe1f39726145acb7a5651520a66ea.

Reason for revert: Fixed the error in metadata.

Original change's description:
> Revert "[merge][sdk] Change sysroot and cc_prebuilt_library to use new schema"
>
> This reverts commit 7756cae60eeb4161268d747d5b2ecde8713704e3.
>
> Reason for revert: This breaks the chromium as it cannot parse the metadata
>
> Original change's description:
> > [merge][sdk] Change sysroot and cc_prebuilt_library to use new schema
> >
> > We are going to support multiple api_level + arch combination of subtype
> > SDK builds and merge them together. The current sysroot schema does not
> > support "variant" as defined in: fxr/914933. Now we are able to merge
> > sysroot and cc_prebuilt_library from multiple subtypes.
> >
> > Bug: b/300271055
> > Change-Id: Iec34a84fe93b01c11ecd81e261ae10296a41897f
> > Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/917200
> > Commit-Queue: Jiaming Li <liji...@google.com>
> > Reviewed-by: Adam Barth <aba...@google.com>
>
> Bug: b/300271055
> Change-Id: Icd2262e470046f66a775a36db6e1078c2570e190
> Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/918912
> Reviewed-by: RubberStamper 🤖 <android-bu...@system.gserviceaccount.com>
> Fuchsia-Auto-Submit: Jiaming Li <liji...@google.com>
> Commit-Queue: Jiaming Li <liji...@google.com>
> Reviewed-by: Chase Latta <chase...@google.com>

Bug: b/300271055
Change-Id: I4884c0cf08ba8356b790b0a6e1daa626e225556e
---
M build/cpp/gen_sdk_prebuilt_meta_file.py
M build/cpp/sdk_shared_library.gni
M build/cpp/sdk_static_library.gni
M build/sdk/meta/cc_prebuilt_library.json
M build/sdk/meta/golden/OWNERS
M build/sdk/meta/golden/cc_prebuilt_library.json.golden
M build/sdk/meta/golden/sysroot.json.golden
M build/sdk/meta/src/cc_prebuilt_library.rs
M build/sdk/meta/sysroot.json
M build/zircon/sdk_build_id.py
M scripts/sdk/merger/merge.py
M src/lib/vulkan/BUILD.gn
M zircon/public/sysroot/sdk/BUILD.gn
13 files changed, 404 insertions(+), 72 deletions(-)

To view, visit change 918848. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: newchange

Gerrit-Project: fuchsia

Gerrit-Branch: main

Gerrit-Change-Id: I4884c0cf08ba8356b790b0a6e1daa626e225556e

Gerrit-Change-Number: 918848

Gerrit-PatchSet: 1

Gerrit-Owner: Jiaming Li <liji...@google.com>

Gerrit-Reviewer: Adam Barth <aba...@google.com>

Gerrit-Reviewer: CQ Bot <fuchsia-int...@luci-project-accounts.iam.gserviceaccount.com>

Gerrit-Reviewer: Chase Latta <chase...@google.com>

Gerrit-Reviewer: Clayton Wilkinson <wilkin...@google.com>

Gerrit-Reviewer: David Turner <di...@google.com>

Gerrit-Reviewer: Hunter Freyer <hjfr...@google.com>

Gerrit-Reviewer: Rubber Stamper (Chrome) <rubber-...@appspot.gserviceaccount.com>

Gerrit-Reviewer: RubberStamper 🤖 <android-bu...@system.gserviceaccount.com>

Gerrit-CC: GI Roller <global-integra...@fuchsia-infra.iam.gserviceaccount.com>

Gerrit-CC: Seth Ladd <seth...@google.com>

Gerrit-CC: Zijie He <zij...@google.com>

Gerrit-Attention: Clayton Wilkinson <wilkin...@google.com>

Gerrit-Attention: Chase Latta <chase...@google.com>

Gerrit-Attention: David Turner <di...@google.com>

Gerrit-Attention: Adam Barth <aba...@google.com>

Gerrit-Attention: Hunter Freyer <hjfr...@google.com>