Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
briantting authored May 2, 2024
2 parents aed1898 + ec5ebab commit 21a7e36
Show file tree
Hide file tree
Showing 23 changed files with 3,192 additions and 1,715 deletions.
12 changes: 12 additions & 0 deletions third_party/lss/DIR_METADATA
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Metadata information for this directory.
#
# For more information on DIR_METADATA files, see:
# https://source.chromium.org/chromium/infra/infra/+/HEAD:go/src/infra/tools/dirmd/README.md
#
# For the schema of this file, see Metadata message:
# https://source.chromium.org/chromium/infra/infra/+/HEAD:go/src/infra/tools/dirmd/proto/dir_metadata.proto

os: LINUX
monorail {
project: "linux-syscall-support"
}
28 changes: 28 additions & 0 deletions third_party/lss/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
Copyright (c) 2005-2011, Google Inc.
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6 changes: 3 additions & 3 deletions third_party/lss/METADATA
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ description:
third_party {
identifier {
type: "ChromiumVersion"
value: "86.0.4240.199" # from https://chromereleases.googleblog.com/2020/11/stable-channel-update-for-chrome-os_30.html
value: "114.0.5735.358" # from https://chromereleases.googleblog.com/2024/03/long-term-support-channel-update-for_26.html
}
identifier {
type: "Git"
value: "https://chromium.googlesource.com/linux-syscall-support.git"
version: "29f7c7e018f4ce706a709f0b0afbf8bacf869480"
# from https://chromium.googlesource.com/chromium/src/+/86.0.4240.199/DEPS#242
version: "ce877209e11aa69dcfffbd53ef90ea1d07136521"
# from https://chromium.googlesource.com/chromium/src/+/114.0.5735.358/DEPS#339
}
last_upgrade_date {
year: 2020
Expand Down
2 changes: 2 additions & 0 deletions third_party/lss/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[email protected]
[email protected]
3 changes: 2 additions & 1 deletion third_party/lss/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ the header itself as this list might be out of date.
* MIPS 32-bit o32 ABI
* MIPS 32-bit n32 ABI
* MIPS 64-bit n64 ABI
* LOONGARCH 64-bit ABI

## API

Expand Down Expand Up @@ -130,7 +131,7 @@ It only compiles things (does not execute at all).

If you commit a change to LSS, please also commit a Chromium change to update
`lss_revision` in
[Chromium's DEPS](https://chromium.googlesource.com/chromium/src/+/master/DEPS)
[Chromium's DEPS](https://chromium.googlesource.com/chromium/src/+/HEAD/DEPS)
file.

This ensures that the LSS change gets tested, so that people who commit later
Expand Down
Loading

0 comments on commit 21a7e36

Please sign in to comment.