Skip to content

Commit 5d0ff03

Browse files
authored
[xaprepare] Emit ThirdPartyNotices entries for mman, dlfcn (#4912)
`external/dlfcn-win32` and `external/mman-win32` were added in commit d8fdbcf, but we accidentally overlooked that the content of these submodules was included into built binary artifacts, and redistributed via our installers.' Consequently, these resources *should* have been listed in the generated `ThirdPartyNotices.txt` which is included in the installers, but they were not. Add appropriate `ThirdPartyNotices.txt` entries for [dlfcn-win32/dlfcn-win32][0] and [witwall/mman-win32][1]. [0]: https://github.com/dlfcn-win32/dlfcn-win32 [1]: https://github.com/witwall/mman-win32
1 parent 7415e46 commit 5d0ff03

File tree

3 files changed

+64
-0
lines changed

3 files changed

+64
-0
lines changed
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.IO;
4+
5+
namespace Xamarin.Android.Prepare
6+
{
7+
[TPN]
8+
class dlfcn_TPN : ThirdPartyNotice
9+
{
10+
static readonly Uri url = new Uri ("https://github.com/dlfcn-win32/dlfcn-win32/");
11+
static readonly string licenseFile = Path.Combine (Configurables.Paths.ExternalDir, "dlfcn-win32", "COPYING");
12+
13+
14+
public override string LicenseFile => licenseFile;
15+
public override string Name => "dlfcn-win32/dlfcn-win32";
16+
public override Uri SourceUrl => url;
17+
public override string LicenseText => "";
18+
19+
public override bool Include (bool includeExternalDeps, bool includeBuildDeps) => includeExternalDeps;
20+
}
21+
}
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.IO;
4+
5+
namespace Xamarin.Android.Prepare
6+
{
7+
[TPN]
8+
class witwall_mman_TPN : ThirdPartyNotice
9+
{
10+
static readonly Uri url = new Uri ("https://github.com/witwall/mman-win32/");
11+
12+
public override string LicenseFile => string.Empty;
13+
public override string Name => "witwall/mman-win32";
14+
public override Uri SourceUrl => url;
15+
public override string LicenseText => @"
16+
MIT License
17+
18+
Copyright (c) 2018 Steven Lee
19+
20+
Permission is hereby granted, free of charge, to any person obtaining a copy
21+
of this software and associated documentation files (the ""Software""), to deal
22+
in the Software without restriction, including without limitation the rights
23+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
24+
copies of the Software, and to permit persons to whom the Software is
25+
furnished to do so, subject to the following conditions:
26+
27+
The above copyright notice and this permission notice shall be included in all
28+
copies or substantial portions of the Software.
29+
30+
THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
31+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
32+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
33+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
34+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
35+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
36+
SOFTWARE.
37+
";
38+
39+
public override bool Include (bool includeExternalDeps, bool includeBuildDeps) => includeExternalDeps;
40+
}
41+
}

build-tools/xaprepare/xaprepare/xaprepare.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@
156156
<Compile Include="Steps\Step_ThirdPartyNotices.cs" />
157157
<Compile Include="ThirdPartyNotices\aapt2.cs" />
158158
<Compile Include="ThirdPartyNotices\bundletool.cs" />
159+
<Compile Include="ThirdPartyNotices\dlfcn.cs" />
159160
<Compile Include="ThirdPartyNotices\Java.Interop.cs" />
160161
<Compile Include="ThirdPartyNotices\K4os.Compression.LZ4.cs" />
161162
<Compile Include="ThirdPartyNotices\lz4.cs" />
@@ -164,6 +165,7 @@
164165
<Compile Include="ThirdPartyNotices\proguard.cs" />
165166
<Compile Include="ThirdPartyNotices\r8.cs" />
166167
<Compile Include="ThirdPartyNotices\sqlite.cs" />
168+
<Compile Include="ThirdPartyNotices\witwall_mman.cs" />
167169
<Compile Include="ThirdPartyNotices\Xamarin.Android.Build.Tasks.cs" />
168170
<Compile Include="ThirdPartyNotices\Xamarin.Android.NunitLite.cs" />
169171
<Compile Include="ThirdPartyNotices\Xamarin.Android.Tools.Aidl.cs" />

0 commit comments

Comments
 (0)