Skip to content

Commit e09c239

Browse files
grendellogrendello
committed
Merge branch 'main' into dev/grendel/bump-binutils-18.1.2
* main: Update THIRD-PARTY-NOTICES.txt generation code (#8853) [APIScan] Scan extra symbols and update parameters (#8812)
2 parents 7271e3a + 86fcf16 commit e09c239

File tree

4 files changed

+121
-74
lines changed

4 files changed

+121
-74
lines changed

‎THIRD-PARTY-NOTICES.TXT

Lines changed: 71 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ The attached notices are provided for information only.
1313

1414
1. android/platform/tools/base (https://android.googlesource.com/platform/tools/base/+/d41d662dbf89f9b60ca6256415a059c0107749b8/sdk-common/NOTICE)
1515
2. bazelbuild/bazel (https://github.com/bazelbuild/bazel/)
16-
3. force-net/crc32.net (https://github.com/force-net/Crc32.NET)
17-
4. nunit/nunitlite (https://github.com/nunit/nunitlite/)
18-
5. tessil/robin-map (https://github.com/Tessil/robin-map)
16+
3. chys87/constexpr-xxh3 (https://github.com/chys87/constexpr-xxh3/)
17+
4. Cyan4973/xxHash (https://github.com/Cyan4973/xxHash/)
18+
5. force-net/crc32.net (https://github.com/force-net/Crc32.NET)
19+
6. nunit/nunitlite (https://github.com/nunit/nunitlite/)
20+
7. tessil/robin-map (https://github.com/Tessil/robin-map)
1921

2022
%% android/platform/tools/base NOTICES AND INFORMATION BEGIN HERE
2123
=================================================================
@@ -433,6 +435,72 @@ END OF android/platform/tools/base NOTICES AND INFORMATION
433435
======================================================
434436
END OF bazelbuild/bazel NOTICES AND INFORMATION
435437

438+
%% chys87/constexpr-xxh3 NOTICES AND INFORMATION BEGIN HERE
439+
===========================================================
440+
BSD 2-Clause License
441+
442+
constexpr-xxh3 - C++20 constexpr implementation of the XXH3 64-bit variant of xxHash
443+
Copyright (c) 2021-2023, chys <[email protected]> <chys87@github>
444+
All rights reserved.
445+
446+
Redistribution and use in source and binary forms, with or without
447+
modification, are permitted provided that the following conditions are met:
448+
449+
1. Redistributions of source code must retain the above copyright notice, this
450+
list of conditions and the following disclaimer.
451+
452+
2. Redistributions in binary form must reproduce the above copyright notice,
453+
this list of conditions and the following disclaimer in the documentation
454+
and/or other materials provided with the distribution.
455+
456+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
457+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
458+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
459+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
460+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
461+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
462+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
463+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
464+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
465+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
466+
467+
468+
===========================================================
469+
END OF chys87/constexpr-xxh3 NOTICES AND INFORMATION
470+
471+
%% Cyan4973/xxHash NOTICES AND INFORMATION BEGIN HERE
472+
=====================================================
473+
xxHash Library
474+
Copyright (c) 2012-2021 Yann Collet
475+
All rights reserved.
476+
477+
BSD 2-Clause License (https://www.opensource.org/licenses/bsd-license.php)
478+
479+
Redistribution and use in source and binary forms, with or without modification,
480+
are permitted provided that the following conditions are met:
481+
482+
* Redistributions of source code must retain the above copyright notice, this
483+
list of conditions and the following disclaimer.
484+
485+
* Redistributions in binary form must reproduce the above copyright notice, this
486+
list of conditions and the following disclaimer in the documentation and/or
487+
other materials provided with the distribution.
488+
489+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
490+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
491+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
492+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
493+
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
494+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
495+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
496+
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
497+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
498+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
499+
500+
501+
=====================================================
502+
END OF Cyan4973/xxHash NOTICES AND INFORMATION
503+
436504
%% force-net/crc32.net NOTICES AND INFORMATION BEGIN HERE
437505
=========================================================
438506
The MIT License (MIT)
@@ -516,68 +584,3 @@ SOFTWARE.
516584
======================================================
517585
END OF tessil/robin-map NOTICES AND INFORMATION
518586

519-
%% chys87/constexpr-xxh3 NOTICES AND INFORMATION BEGIN HERE
520-
===========================================================
521-
522-
BSD 2-Clause License
523-
524-
constexpr-xxh3 - C++20 constexpr implementation of the XXH3 64-bit variant of xxHash
525-
Copyright (c) 2021-2023, chys <[email protected]> <chys87@github>
526-
All rights reserved.
527-
528-
Redistribution and use in source and binary forms, with or without
529-
modification, are permitted provided that the following conditions are met:
530-
531-
1. Redistributions of source code must retain the above copyright notice, this
532-
list of conditions and the following disclaimer.
533-
534-
2. Redistributions in binary form must reproduce the above copyright notice,
535-
this list of conditions and the following disclaimer in the documentation
536-
and/or other materials provided with the distribution.
537-
538-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
539-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
540-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
541-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
542-
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
543-
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
544-
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
545-
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
546-
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
547-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
548-
549-
======================================================
550-
END OF chys87/constexpr-xxh3 NOTICES AND INFORMATION
551-
552-
%% Cyan4973/xxHash NOTICES AND INFORMATION BEGIN HERE
553-
=====================================================
554-
555-
xxHash Library
556-
Copyright (c) 2012-2021 Yann Collet
557-
All rights reserved.
558-
559-
BSD 2-Clause License (https://www.opensource.org/licenses/bsd-license.php)
560-
561-
Redistribution and use in source and binary forms, with or without modification,
562-
are permitted provided that the following conditions are met:
563-
564-
* Redistributions of source code must retain the above copyright notice, this
565-
list of conditions and the following disclaimer.
566-
567-
* Redistributions in binary form must reproduce the above copyright notice, this
568-
list of conditions and the following disclaimer in the documentation and/or
569-
other materials provided with the distribution.
570-
571-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
572-
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
573-
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
574-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
575-
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
576-
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
577-
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
578-
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
579-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
580-
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
581-
582-
%% END OF Cyan4973/xxHash NOTICES AND INFORMATION
583-
=================================================

‎build-tools/automation/azure-pipelines-nightly.yaml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,11 @@ stages:
294294
timeoutInMinutes: 480
295295
workspace:
296296
clean: all
297+
variables:
298+
- name: ApiScanSoftwareName
299+
value: VS
300+
- name: ApiScanSoftwareVersion
301+
value: 17.10
297302
steps:
298303
- template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
299304
parameters:
@@ -317,21 +322,21 @@ stages:
317322
Contents: |
318323
$(System.DefaultWorkingDirectory)\bin\$(XA.Build.Configuration)\dotnet\packs\Microsoft.Android*\**\?(*.dll|*.exe|*.pdb)
319324
$(System.DefaultWorkingDirectory)\binutils-pdb\*.pdb
320-
TargetFolder: $(Build.StagingDirectory)\apiscan
325+
TargetFolder: $(Agent.TempDirectory)\T
321326
OverWrite: true
322327
flattenFolders: true
323328

324-
- pwsh: Get-ChildItem -Path "$(Build.StagingDirectory)\apiscan" -Recurse
329+
- pwsh: Get-ChildItem -Path "$(Agent.TempDirectory)\T" -Recurse
325330
displayName: List Files for APIScan
326331

327332
### Run latest version of APIScan listed at https://www.1eswiki.com/wiki/APIScan_Build_Task
328333
- task: APIScan@2
329334
displayName: Run APIScan
330335
inputs:
331-
softwareFolder: $(Build.StagingDirectory)\apiscan
332-
symbolsFolder: 'SRV*http://symweb;$(Build.StagingDirectory)\apiscan'
333-
softwareName: $(ApiScanName)
334-
softwareVersionNum: $(Build.SourceBranchName)-$(Build.SourceVersion)$(System.JobAttempt)
336+
softwareFolder: $(Agent.TempDirectory)\T
337+
symbolsFolder: 'SRV*http://symweb;$(Agent.TempDirectory)\T'
338+
softwareName: $(ApiScanSoftwareName)
339+
softwareVersionNum: $(ApiScanSoftwareVersion)
335340
isLargeApp: true
336341
toolVersion: Latest
337342
env:

‎build-tools/xaprepare/xaprepare/Steps/Step_InstallGNUBinutils.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,11 @@ void CopyTools (string prefix)
122122
Utilities.CopyFile (toolSourcePath, toolDestinationPath);
123123
Utilities.CopyFile (toolSourcePdbPath, toolDestinationPdbPath);
124124
}
125+
// Copy PDB files for tools that have been renamed
126+
if (isWindows) {
127+
Utilities.CopyFile (Path.Combine (sourcePath, "lld.pdb"), Path.Combine (symbolArchiveDir, "lld.pdb"));
128+
Utilities.CopyFile (Path.Combine (sourcePath, "llvm-objcopy.pdb"), Path.Combine (symbolArchiveDir, "llvm-objcopy.pdb"));
129+
}
125130
}
126131
}
127132

‎build-tools/xaprepare/xaprepare/ThirdPartyNotices/xxHash.cs

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.IO;
4+
5+
namespace Xamarin.Android.Prepare
6+
{
7+
[TPN]
8+
class constexpr_xxh3_TPN : ThirdPartyNotice
9+
{
10+
static readonly Uri url = new Uri ("https://github.com/chys87/constexpr-xxh3/");
11+
static readonly string licenseFile = Path.Combine (Configurables.Paths.ExternalDir, "constexpr-xxh3", "LICENSE");
12+
13+
public override string LicenseFile => licenseFile;
14+
public override string Name => "chys87/constexpr-xxh3";
15+
public override Uri SourceUrl => url;
16+
public override string LicenseText => String.Empty;
17+
18+
public override bool Include (bool includeExternalDeps, bool includeBuildDeps) => includeBuildDeps;
19+
}
20+
21+
[TPN]
22+
class xxHash_TPN : ThirdPartyNotice
23+
{
24+
static readonly Uri url = new Uri ("https://github.com/Cyan4973/xxHash/");
25+
static readonly string licenseFile = Path.Combine (Configurables.Paths.ExternalDir, "xxHash", "LICENSE");
26+
27+
public override string LicenseFile => licenseFile;
28+
public override string Name => "Cyan4973/xxHash";
29+
public override Uri SourceUrl => url;
30+
public override string LicenseText => String.Empty;
31+
32+
public override bool Include (bool includeExternalDeps, bool includeBuildDeps) => includeBuildDeps;
33+
}
34+
}

0 commit comments

Comments
 (0)