From b834e151d42977a1cb5210eeab0e966af0ff876f Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Fri, 13 Sep 2024 15:08:05 -0700 Subject: [PATCH] gfxstream: re-license files Re-license files to MIT, by popular demand. These files are have an origin in AOSP. Reviewed-by: Aaron Ruby Acked-by: Yonggang Luo Acked-by: Adam Jackson Part-of: --- .../AddressSpaceStream.cpp | 17 +++---------- .../GoldfishAddressSpaceStream.cpp | 17 +++---------- .../VirtioGpuAddressSpaceStream.cpp | 17 +++---------- .../goldfish_address_space.cpp | 18 +++---------- .../include/AddressSpaceStream.h | 18 +++---------- .../include/GoldfishAddressSpaceStream.h | 17 +++---------- .../include/VirtioGpuAddressSpaceStream.h | 17 +++---------- .../include/address_space.h | 17 +++---------- .../include/address_space_graphics_types.h | 17 +++---------- .../include/goldfish_address_space.h | 17 +++---------- .../GfxStreamConnection.cpp | 2 +- .../connection-manager/GfxStreamConnection.h | 2 +- .../GfxStreamConnectionManager.cpp | 2 +- .../GfxStreamConnectionManager.h | 2 +- .../connection-manager/QemuPipeStream.cpp | 15 ++--------- .../guest/connection-manager/QemuPipeStream.h | 15 ++--------- .../connection-manager/QemuPipeStreamStub.cpp | 4 +-- .../VirtioGpuPipeStream.cpp | 15 ++--------- .../connection-manager/VirtioGpuPipeStream.h | 15 ++--------- .../include/gfxstream/guest/IOStream.h | 17 +++---------- src/gfxstream/guest/platform/VirtGpu.cpp | 15 ++--------- .../guest/platform/fuchsia/FuchsiaVirtGpu.h | 15 ++--------- .../platform/fuchsia/FuchsiaVirtGpuBlob.cpp | 15 ++--------- .../fuchsia/FuchsiaVirtGpuBlobMapping.cpp | 15 ++--------- .../platform/fuchsia/FuchsiaVirtGpuDevice.cpp | 15 ++--------- .../platform/fuchsia/os_dirent_fuchsia.cpp | 15 ++--------- src/gfxstream/guest/platform/include/Sync.h | 17 +++---------- .../guest/platform/include/VirtGpu.h | 15 ++--------- src/gfxstream/guest/platform/include/util.h | 15 ++--------- .../include/virtgpu_gfxstream_protocol.h | 17 +++---------- .../guest/platform/kumquat/VirtGpuKumquat.h | 15 ++--------- .../platform/kumquat/VirtGpuKumquatBlob.cpp | 15 ++--------- .../kumquat/VirtGpuKumquatBlobMapping.cpp | 15 ++--------- .../platform/kumquat/VirtGpuKumquatDevice.cpp | 15 ++--------- .../platform/kumquat/VirtGpuKumquatStub.cpp | 15 ++--------- .../platform/kumquat/VirtGpuKumquatSync.cpp | 15 ++--------- .../platform/kumquat/VirtGpuKumquatSync.h | 17 +++---------- .../guest/platform/linux/LinuxSync.cpp | 16 ++---------- .../guest/platform/linux/LinuxSync.h | 17 +++---------- .../guest/platform/linux/LinuxVirtGpu.h | 15 ++--------- .../guest/platform/linux/LinuxVirtGpuBlob.cpp | 15 ++--------- .../linux/LinuxVirtGpuBlobMapping.cpp | 15 ++--------- .../platform/linux/LinuxVirtGpuDevice.cpp | 15 ++--------- .../guest/platform/linux/meson.build | 2 +- src/gfxstream/guest/platform/meson.build | 2 +- .../guest/vulkan/gfxstream_vk_android.cpp | 2 +- .../guest/vulkan/gfxstream_vk_cmd.cpp | 17 +++---------- .../guest/vulkan/gfxstream_vk_device.cpp | 17 +++---------- .../guest/vulkan/gfxstream_vk_fuchsia.cpp | 2 +- .../guest/vulkan/gfxstream_vk_wsi.cpp | 17 +++---------- .../guest/vulkan/gfxstream_vk_wsi_stub.cpp | 17 +++---------- .../vulkan/stubs/GfxStreamRenderControl.cpp | 2 +- .../vulkan/stubs/GfxStreamRenderControl.h | 2 +- .../vulkan_enc/AndroidHardwareBuffer.cpp | 18 +++---------- .../guest/vulkan_enc/AndroidHardwareBuffer.h | 18 +++---------- .../vulkan_enc/CommandBufferStagingStream.cpp | 15 ++--------- .../vulkan_enc/CommandBufferStagingStream.h | 15 ++--------- .../DescriptorSetVirtualization.cpp | 18 +++---------- .../vulkan_enc/DescriptorSetVirtualization.h | 18 +++---------- .../vulkan_enc/GfxStreamVulkanConnection.cpp | 2 +- .../vulkan_enc/GfxStreamVulkanConnection.h | 17 +++---------- .../HostVisibleMemoryVirtualization.cpp | 18 +++---------- .../HostVisibleMemoryVirtualization.h | 18 +++---------- .../guest/vulkan_enc/ResourceTracker.cpp | 18 +++---------- .../guest/vulkan_enc/ResourceTracker.h | 18 +++---------- src/gfxstream/guest/vulkan_enc/Resources.cpp | 17 +++---------- src/gfxstream/guest/vulkan_enc/Resources.h | 17 +++---------- src/gfxstream/guest/vulkan_enc/Validation.cpp | 17 +++---------- src/gfxstream/guest/vulkan_enc/Validation.h | 17 +++---------- .../guest/vulkan_enc/VkEncoder.cpp.inl | 5 ++++ .../guest/vulkan_enc/VkEncoder.h.inl | 4 +++ .../guest/vulkan_enc/VulkanHandleMapping.cpp | 18 +++---------- .../guest/vulkan_enc/VulkanHandleMapping.h | 20 ++++----------- .../guest/vulkan_enc/VulkanHandles.h | 18 +++---------- .../guest/vulkan_enc/VulkanStreamGuest.cpp | 17 +++---------- .../guest/vulkan_enc/VulkanStreamGuest.h | 17 +++---------- .../guest/vulkan_enc/gfxstream_vk_private.cpp | 17 +++---------- .../vulkan_enc/goldfish_vk_private_defs.h | 11 +++----- ...eueFlushCommandsGOOGLE_encode_impl.cpp.inl | 8 +++--- .../guest/vulkan_enc/vk_format_info.h | 25 ++----------------- .../guest/vulkan_enc/vk_platform_compat.h | 17 +++---------- src/gfxstream/guest/vulkan_enc/vk_struct_id.h | 18 +++---------- src/gfxstream/guest/vulkan_enc/vk_util.h | 22 ++-------------- 83 files changed, 243 insertions(+), 930 deletions(-) diff --git a/src/gfxstream/guest/GoldfishAddressSpace/AddressSpaceStream.cpp b/src/gfxstream/guest/GoldfishAddressSpace/AddressSpaceStream.cpp index eb60db7bf13..e95a38a17df 100644 --- a/src/gfxstream/guest/GoldfishAddressSpace/AddressSpaceStream.cpp +++ b/src/gfxstream/guest/GoldfishAddressSpace/AddressSpaceStream.cpp @@ -1,18 +1,7 @@ /* -* Copyright (C) 2011 The Android Open Source Project -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + * Copyright 2020 Google + * SPDX-License-Identifier: MIT + */ #include "AddressSpaceStream.h" #include diff --git a/src/gfxstream/guest/GoldfishAddressSpace/GoldfishAddressSpaceStream.cpp b/src/gfxstream/guest/GoldfishAddressSpace/GoldfishAddressSpaceStream.cpp index db243670cd0..a621b14af13 100644 --- a/src/gfxstream/guest/GoldfishAddressSpace/GoldfishAddressSpaceStream.cpp +++ b/src/gfxstream/guest/GoldfishAddressSpace/GoldfishAddressSpaceStream.cpp @@ -1,16 +1,7 @@ -// Copyright 2023 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2023 Google + * SPDX-License-Identifier: MIT + */ #include "GoldfishAddressSpaceStream.h" diff --git a/src/gfxstream/guest/GoldfishAddressSpace/VirtioGpuAddressSpaceStream.cpp b/src/gfxstream/guest/GoldfishAddressSpace/VirtioGpuAddressSpaceStream.cpp index 343f33a1077..0c304b543a3 100644 --- a/src/gfxstream/guest/GoldfishAddressSpace/VirtioGpuAddressSpaceStream.cpp +++ b/src/gfxstream/guest/GoldfishAddressSpace/VirtioGpuAddressSpaceStream.cpp @@ -1,16 +1,7 @@ -// Copyright 2023 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2023 Google + * SPDX-License-Identifier: MIT + */ #include "VirtioGpuAddressSpaceStream.h" diff --git a/src/gfxstream/guest/GoldfishAddressSpace/goldfish_address_space.cpp b/src/gfxstream/guest/GoldfishAddressSpace/goldfish_address_space.cpp index db965f94363..b069bef14bc 100644 --- a/src/gfxstream/guest/GoldfishAddressSpace/goldfish_address_space.cpp +++ b/src/gfxstream/guest/GoldfishAddressSpace/goldfish_address_space.cpp @@ -1,17 +1,7 @@ -// Copyright (C) 2019 The Android Open Source Project -// Copyright (C) 2019 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2019 Google + * SPDX-License-Identifier: MIT + */ #include "goldfish_address_space.h" diff --git a/src/gfxstream/guest/GoldfishAddressSpace/include/AddressSpaceStream.h b/src/gfxstream/guest/GoldfishAddressSpace/include/AddressSpaceStream.h index cda1b093a27..2fe9ce25448 100644 --- a/src/gfxstream/guest/GoldfishAddressSpace/include/AddressSpaceStream.h +++ b/src/gfxstream/guest/GoldfishAddressSpace/include/AddressSpaceStream.h @@ -1,18 +1,8 @@ /* -* Copyright (C) 2011 The Android Open Source Project -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + * Copyright 2011 Google + * SPDX-License-Identifier: MIT + */ + #ifndef __ADDRESS_SPACE_STREAM_H #define __ADDRESS_SPACE_STREAM_H diff --git a/src/gfxstream/guest/GoldfishAddressSpace/include/GoldfishAddressSpaceStream.h b/src/gfxstream/guest/GoldfishAddressSpace/include/GoldfishAddressSpaceStream.h index 252f023b8b6..4b4d39fed37 100644 --- a/src/gfxstream/guest/GoldfishAddressSpace/include/GoldfishAddressSpaceStream.h +++ b/src/gfxstream/guest/GoldfishAddressSpace/include/GoldfishAddressSpaceStream.h @@ -1,16 +1,7 @@ -// Copyright 2023 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2023 Google + * SPDX-License-Identifier: MIT + */ #pragma once diff --git a/src/gfxstream/guest/GoldfishAddressSpace/include/VirtioGpuAddressSpaceStream.h b/src/gfxstream/guest/GoldfishAddressSpace/include/VirtioGpuAddressSpaceStream.h index c3a62417f8e..74d49732b77 100644 --- a/src/gfxstream/guest/GoldfishAddressSpace/include/VirtioGpuAddressSpaceStream.h +++ b/src/gfxstream/guest/GoldfishAddressSpace/include/VirtioGpuAddressSpaceStream.h @@ -1,16 +1,7 @@ -// Copyright 2023 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2023 Google + * SPDX-License-Identifier: MIT + */ #pragma once diff --git a/src/gfxstream/guest/GoldfishAddressSpace/include/address_space.h b/src/gfxstream/guest/GoldfishAddressSpace/include/address_space.h index 60bff6daa3d..90ccdbd80b3 100644 --- a/src/gfxstream/guest/GoldfishAddressSpace/include/address_space.h +++ b/src/gfxstream/guest/GoldfishAddressSpace/include/address_space.h @@ -1,16 +1,7 @@ -// Copyright 2023 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2023 Google + * SPDX-License-Identifier: MIT + */ #pragma once diff --git a/src/gfxstream/guest/GoldfishAddressSpace/include/address_space_graphics_types.h b/src/gfxstream/guest/GoldfishAddressSpace/include/address_space_graphics_types.h index e52c8fe22d4..79fce920585 100644 --- a/src/gfxstream/guest/GoldfishAddressSpace/include/address_space_graphics_types.h +++ b/src/gfxstream/guest/GoldfishAddressSpace/include/address_space_graphics_types.h @@ -1,16 +1,7 @@ -// Copyright 2019 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2019 Google + * SPDX-License-Identifier: MIT + */ #pragma once #include "aemu/base/ring_buffer.h" diff --git a/src/gfxstream/guest/GoldfishAddressSpace/include/goldfish_address_space.h b/src/gfxstream/guest/GoldfishAddressSpace/include/goldfish_address_space.h index bd61fd61976..26ccb704a82 100644 --- a/src/gfxstream/guest/GoldfishAddressSpace/include/goldfish_address_space.h +++ b/src/gfxstream/guest/GoldfishAddressSpace/include/goldfish_address_space.h @@ -1,16 +1,7 @@ -// Copyright 2018 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2018 Google + * SPDX-License-Identifier: MIT + */ #ifndef ANDROID_INCLUDE_HARDWARE_GOLDFISH_ADDRESS_SPACE_H #define ANDROID_INCLUDE_HARDWARE_GOLDFISH_ADDRESS_SPACE_H diff --git a/src/gfxstream/guest/connection-manager/GfxStreamConnection.cpp b/src/gfxstream/guest/connection-manager/GfxStreamConnection.cpp index cc4024be9a8..156ec4b36ed 100644 --- a/src/gfxstream/guest/connection-manager/GfxStreamConnection.cpp +++ b/src/gfxstream/guest/connection-manager/GfxStreamConnection.cpp @@ -1,6 +1,6 @@ /* * Copyright 2024 Google LLC - * SPDX-License-Identifier: Apache-2.0 + * SPDX-License-Identifier: MIT */ #include "GfxStreamConnection.h" diff --git a/src/gfxstream/guest/connection-manager/GfxStreamConnection.h b/src/gfxstream/guest/connection-manager/GfxStreamConnection.h index 3da9cb01976..ad663dad87a 100644 --- a/src/gfxstream/guest/connection-manager/GfxStreamConnection.h +++ b/src/gfxstream/guest/connection-manager/GfxStreamConnection.h @@ -1,6 +1,6 @@ /* * Copyright 2024 Google LLC - * SPDX-License-Identifier: Apache-2.0 + * SPDX-License-Identifier: MIT */ #ifndef GFXSTREAM_CONNECTION_H diff --git a/src/gfxstream/guest/connection-manager/GfxStreamConnectionManager.cpp b/src/gfxstream/guest/connection-manager/GfxStreamConnectionManager.cpp index fdbae20bbed..96fde7cae0c 100644 --- a/src/gfxstream/guest/connection-manager/GfxStreamConnectionManager.cpp +++ b/src/gfxstream/guest/connection-manager/GfxStreamConnectionManager.cpp @@ -1,6 +1,6 @@ /* * Copyright 2024 Google LLC - * SPDX-License-Identifier: Apache-2.0 + * SPDX-License-Identifier: MIT */ #include "GfxStreamConnectionManager.h" diff --git a/src/gfxstream/guest/connection-manager/GfxStreamConnectionManager.h b/src/gfxstream/guest/connection-manager/GfxStreamConnectionManager.h index 7ab8e360f4a..c6243419bbc 100644 --- a/src/gfxstream/guest/connection-manager/GfxStreamConnectionManager.h +++ b/src/gfxstream/guest/connection-manager/GfxStreamConnectionManager.h @@ -1,6 +1,6 @@ /* * Copyright 2024 Google LLC - * SPDX-License-Identifier: Apache-2.0 + * SPDX-License-Identifier: MIT */ #ifndef GFXSTREAM_CONNECTION_MANAGER_H diff --git a/src/gfxstream/guest/connection-manager/QemuPipeStream.cpp b/src/gfxstream/guest/connection-manager/QemuPipeStream.cpp index 9e6738786ba..dd5327a5c5f 100644 --- a/src/gfxstream/guest/connection-manager/QemuPipeStream.cpp +++ b/src/gfxstream/guest/connection-manager/QemuPipeStream.cpp @@ -1,17 +1,6 @@ /* - * Copyright (C) 2011 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2011 Google LLC + * SPDX-License-Identifier: MIT */ #include "QemuPipeStream.h" diff --git a/src/gfxstream/guest/connection-manager/QemuPipeStream.h b/src/gfxstream/guest/connection-manager/QemuPipeStream.h index 14f72a52081..2a81fd54794 100644 --- a/src/gfxstream/guest/connection-manager/QemuPipeStream.h +++ b/src/gfxstream/guest/connection-manager/QemuPipeStream.h @@ -1,17 +1,6 @@ /* - * Copyright (C) 2011 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2011 Google LLC + * SPDX-License-Identifier: MIT */ #ifndef __QEMU_PIPE_STREAM_H #define __QEMU_PIPE_STREAM_H diff --git a/src/gfxstream/guest/connection-manager/QemuPipeStreamStub.cpp b/src/gfxstream/guest/connection-manager/QemuPipeStreamStub.cpp index 0e7bd9c3c2f..846cc586260 100644 --- a/src/gfxstream/guest/connection-manager/QemuPipeStreamStub.cpp +++ b/src/gfxstream/guest/connection-manager/QemuPipeStreamStub.cpp @@ -1,6 +1,6 @@ /* - * Copyright 2024 Google LLC - * SPDX-License-Identifier: Apache-2.0 + * Copyright 2018 Google LLC + * SPDX-License-Identifier: MIT */ #include "QemuPipeStream.h" diff --git a/src/gfxstream/guest/connection-manager/VirtioGpuPipeStream.cpp b/src/gfxstream/guest/connection-manager/VirtioGpuPipeStream.cpp index d969ad1d870..0e68dce58ae 100644 --- a/src/gfxstream/guest/connection-manager/VirtioGpuPipeStream.cpp +++ b/src/gfxstream/guest/connection-manager/VirtioGpuPipeStream.cpp @@ -1,17 +1,6 @@ /* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2018 Google LLC + * SPDX-License-Identifier: MIT */ #include "VirtioGpuPipeStream.h" diff --git a/src/gfxstream/guest/connection-manager/VirtioGpuPipeStream.h b/src/gfxstream/guest/connection-manager/VirtioGpuPipeStream.h index 0594269189b..7e262ddaefb 100644 --- a/src/gfxstream/guest/connection-manager/VirtioGpuPipeStream.h +++ b/src/gfxstream/guest/connection-manager/VirtioGpuPipeStream.h @@ -1,17 +1,6 @@ /* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2018 Google LLC + * SPDX-License-Identifier: MIT */ #pragma once diff --git a/src/gfxstream/guest/iostream/include/gfxstream/guest/IOStream.h b/src/gfxstream/guest/iostream/include/gfxstream/guest/IOStream.h index 4778ead9c02..05066541609 100644 --- a/src/gfxstream/guest/iostream/include/gfxstream/guest/IOStream.h +++ b/src/gfxstream/guest/iostream/include/gfxstream/guest/IOStream.h @@ -1,18 +1,7 @@ /* -* Copyright (C) 2011 The Android Open Source Project -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + * Copyright 2011 Google LLC + * SPDX-License-Identifier: MIT + */ #ifndef __IO_STREAM_H__ #define __IO_STREAM_H__ diff --git a/src/gfxstream/guest/platform/VirtGpu.cpp b/src/gfxstream/guest/platform/VirtGpu.cpp index e47c5635f71..930bfc62f3e 100644 --- a/src/gfxstream/guest/platform/VirtGpu.cpp +++ b/src/gfxstream/guest/platform/VirtGpu.cpp @@ -1,17 +1,6 @@ /* - * Copyright 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2022 Google + * SPDX-License-Identifier: MIT */ #include "VirtGpu.h" diff --git a/src/gfxstream/guest/platform/fuchsia/FuchsiaVirtGpu.h b/src/gfxstream/guest/platform/fuchsia/FuchsiaVirtGpu.h index efdd8325bbb..411f05d2068 100644 --- a/src/gfxstream/guest/platform/fuchsia/FuchsiaVirtGpu.h +++ b/src/gfxstream/guest/platform/fuchsia/FuchsiaVirtGpu.h @@ -1,17 +1,6 @@ /* - * Copyright 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2023 Google LLC + * SPDX-License-Identifier: MIT */ #pragma once diff --git a/src/gfxstream/guest/platform/fuchsia/FuchsiaVirtGpuBlob.cpp b/src/gfxstream/guest/platform/fuchsia/FuchsiaVirtGpuBlob.cpp index cba5b4c4ef7..375843eef48 100644 --- a/src/gfxstream/guest/platform/fuchsia/FuchsiaVirtGpuBlob.cpp +++ b/src/gfxstream/guest/platform/fuchsia/FuchsiaVirtGpuBlob.cpp @@ -1,17 +1,6 @@ /* - * Copyright 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2023 Google LLC + * SPDX-License-Identifier: MIT */ #include "FuchsiaVirtGpu.h" diff --git a/src/gfxstream/guest/platform/fuchsia/FuchsiaVirtGpuBlobMapping.cpp b/src/gfxstream/guest/platform/fuchsia/FuchsiaVirtGpuBlobMapping.cpp index 453aa5b49a5..98b93069980 100644 --- a/src/gfxstream/guest/platform/fuchsia/FuchsiaVirtGpuBlobMapping.cpp +++ b/src/gfxstream/guest/platform/fuchsia/FuchsiaVirtGpuBlobMapping.cpp @@ -1,17 +1,6 @@ /* - * Copyright 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2023 Google LLC + * SPDX-License-Identifier: MIT */ #include "FuchsiaVirtGpu.h" diff --git a/src/gfxstream/guest/platform/fuchsia/FuchsiaVirtGpuDevice.cpp b/src/gfxstream/guest/platform/fuchsia/FuchsiaVirtGpuDevice.cpp index 28efa196b35..b59104846ca 100644 --- a/src/gfxstream/guest/platform/fuchsia/FuchsiaVirtGpuDevice.cpp +++ b/src/gfxstream/guest/platform/fuchsia/FuchsiaVirtGpuDevice.cpp @@ -1,17 +1,6 @@ /* - * Copyright 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2023 Google LLC + * SPDX-License-Identifier: MIT */ #include diff --git a/src/gfxstream/guest/platform/fuchsia/os_dirent_fuchsia.cpp b/src/gfxstream/guest/platform/fuchsia/os_dirent_fuchsia.cpp index f629dbdb2c6..a05d6cac1b7 100644 --- a/src/gfxstream/guest/platform/fuchsia/os_dirent_fuchsia.cpp +++ b/src/gfxstream/guest/platform/fuchsia/os_dirent_fuchsia.cpp @@ -1,17 +1,6 @@ /* - * Copyright 2024 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2024 Google LLC + * SPDX-License-Identifier: MIT */ #include diff --git a/src/gfxstream/guest/platform/include/Sync.h b/src/gfxstream/guest/platform/include/Sync.h index 51f714f5c48..3680fee9ff5 100644 --- a/src/gfxstream/guest/platform/include/Sync.h +++ b/src/gfxstream/guest/platform/include/Sync.h @@ -1,16 +1,7 @@ -// Copyright 2023 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either expresso or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2023 Google + * SPDX-License-Identifier: MIT + */ #pragma once diff --git a/src/gfxstream/guest/platform/include/VirtGpu.h b/src/gfxstream/guest/platform/include/VirtGpu.h index 95b43ef4cdc..8f7ee182fc4 100644 --- a/src/gfxstream/guest/platform/include/VirtGpu.h +++ b/src/gfxstream/guest/platform/include/VirtGpu.h @@ -1,17 +1,6 @@ /* - * Copyright 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2022 Google + * SPDX-License-Identifier: MIT */ #ifndef VIRTGPU_DEVICE_H #define VIRTGPU_DEVICE_H diff --git a/src/gfxstream/guest/platform/include/util.h b/src/gfxstream/guest/platform/include/util.h index a0f5459758d..b0ac75305c1 100644 --- a/src/gfxstream/guest/platform/include/util.h +++ b/src/gfxstream/guest/platform/include/util.h @@ -1,17 +1,6 @@ /* - * Copyright 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2023 Google + * SPDX-License-Identifier: MIT */ #ifndef UTIL_H #define UTIL_H diff --git a/src/gfxstream/guest/platform/include/virtgpu_gfxstream_protocol.h b/src/gfxstream/guest/platform/include/virtgpu_gfxstream_protocol.h index 1abdb692353..bf2dae8aa41 100644 --- a/src/gfxstream/guest/platform/include/virtgpu_gfxstream_protocol.h +++ b/src/gfxstream/guest/platform/include/virtgpu_gfxstream_protocol.h @@ -1,16 +1,7 @@ -// Copyright 2022 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2022 Google + * SPDX-License-Identifier: MIT + */ #ifndef VIRTGPU_GFXSTREAM_PROTOCOL_H #define VIRTGPU_GFXSTREAM_PROTOCOL_H diff --git a/src/gfxstream/guest/platform/kumquat/VirtGpuKumquat.h b/src/gfxstream/guest/platform/kumquat/VirtGpuKumquat.h index 724ef36b169..ce51d698bf3 100644 --- a/src/gfxstream/guest/platform/kumquat/VirtGpuKumquat.h +++ b/src/gfxstream/guest/platform/kumquat/VirtGpuKumquat.h @@ -1,17 +1,6 @@ /* - * Copyright 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2023 Google + * SPDX-License-Identifier: MIT */ #pragma once diff --git a/src/gfxstream/guest/platform/kumquat/VirtGpuKumquatBlob.cpp b/src/gfxstream/guest/platform/kumquat/VirtGpuKumquatBlob.cpp index 74837b60cc5..e6b31c80b34 100644 --- a/src/gfxstream/guest/platform/kumquat/VirtGpuKumquatBlob.cpp +++ b/src/gfxstream/guest/platform/kumquat/VirtGpuKumquatBlob.cpp @@ -1,17 +1,6 @@ /* - * Copyright 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2022 Google + * SPDX-License-Identifier: MIT */ #include diff --git a/src/gfxstream/guest/platform/kumquat/VirtGpuKumquatBlobMapping.cpp b/src/gfxstream/guest/platform/kumquat/VirtGpuKumquatBlobMapping.cpp index b2577bbb625..09e424682b1 100644 --- a/src/gfxstream/guest/platform/kumquat/VirtGpuKumquatBlobMapping.cpp +++ b/src/gfxstream/guest/platform/kumquat/VirtGpuKumquatBlobMapping.cpp @@ -1,17 +1,6 @@ /* - * Copyright 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2022 Google LLC + * SPDX-License-Identifier: MIT */ #include "VirtGpuKumquat.h" diff --git a/src/gfxstream/guest/platform/kumquat/VirtGpuKumquatDevice.cpp b/src/gfxstream/guest/platform/kumquat/VirtGpuKumquatDevice.cpp index acf04d536f4..0d1162821b9 100644 --- a/src/gfxstream/guest/platform/kumquat/VirtGpuKumquatDevice.cpp +++ b/src/gfxstream/guest/platform/kumquat/VirtGpuKumquatDevice.cpp @@ -1,17 +1,6 @@ /* - * Copyright 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2022 Google + * SPDX-License-Identifier: MIT */ #include diff --git a/src/gfxstream/guest/platform/kumquat/VirtGpuKumquatStub.cpp b/src/gfxstream/guest/platform/kumquat/VirtGpuKumquatStub.cpp index 7f8da98c084..21b42a5f070 100644 --- a/src/gfxstream/guest/platform/kumquat/VirtGpuKumquatStub.cpp +++ b/src/gfxstream/guest/platform/kumquat/VirtGpuKumquatStub.cpp @@ -1,17 +1,6 @@ /* - * Copyright 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2022 Google + * SPDX-License-Identifier: MIT */ #include "Sync.h" diff --git a/src/gfxstream/guest/platform/kumquat/VirtGpuKumquatSync.cpp b/src/gfxstream/guest/platform/kumquat/VirtGpuKumquatSync.cpp index 025ddaa4709..fd1f31c03e2 100644 --- a/src/gfxstream/guest/platform/kumquat/VirtGpuKumquatSync.cpp +++ b/src/gfxstream/guest/platform/kumquat/VirtGpuKumquatSync.cpp @@ -1,17 +1,6 @@ /* - * Copyright 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2023 Google + * SPDX-License-Identifier: MIT */ #include "VirtGpuKumquatSync.h" diff --git a/src/gfxstream/guest/platform/kumquat/VirtGpuKumquatSync.h b/src/gfxstream/guest/platform/kumquat/VirtGpuKumquatSync.h index c8b89e65a4d..d98516e6f6b 100644 --- a/src/gfxstream/guest/platform/kumquat/VirtGpuKumquatSync.h +++ b/src/gfxstream/guest/platform/kumquat/VirtGpuKumquatSync.h @@ -1,16 +1,7 @@ -// Copyright 2023 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either expresso or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2023 Google + * SPDX-License-Identifier: MIT + */ #pragma once diff --git a/src/gfxstream/guest/platform/linux/LinuxSync.cpp b/src/gfxstream/guest/platform/linux/LinuxSync.cpp index 54931812021..241a810abc2 100644 --- a/src/gfxstream/guest/platform/linux/LinuxSync.cpp +++ b/src/gfxstream/guest/platform/linux/LinuxSync.cpp @@ -1,19 +1,7 @@ /* - * Copyright 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2023 Google + * SPDX-License-Identifier: MIT */ - #include "LinuxSync.h" #if defined(__ANDROID__) diff --git a/src/gfxstream/guest/platform/linux/LinuxSync.h b/src/gfxstream/guest/platform/linux/LinuxSync.h index d4434d71f3b..1b53b23cc1b 100644 --- a/src/gfxstream/guest/platform/linux/LinuxSync.h +++ b/src/gfxstream/guest/platform/linux/LinuxSync.h @@ -1,16 +1,7 @@ -// Copyright 2023 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either expresso or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2023 Google + * SPDX-License-Identifier: MIT + */ #pragma once diff --git a/src/gfxstream/guest/platform/linux/LinuxVirtGpu.h b/src/gfxstream/guest/platform/linux/LinuxVirtGpu.h index 5f1c86b0263..46daa0d5915 100644 --- a/src/gfxstream/guest/platform/linux/LinuxVirtGpu.h +++ b/src/gfxstream/guest/platform/linux/LinuxVirtGpu.h @@ -1,17 +1,6 @@ /* - * Copyright 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2023 Google + * SPDX-License-Identifier: MIT */ #pragma once diff --git a/src/gfxstream/guest/platform/linux/LinuxVirtGpuBlob.cpp b/src/gfxstream/guest/platform/linux/LinuxVirtGpuBlob.cpp index 932673b0651..2eb5e81ca50 100644 --- a/src/gfxstream/guest/platform/linux/LinuxVirtGpuBlob.cpp +++ b/src/gfxstream/guest/platform/linux/LinuxVirtGpuBlob.cpp @@ -1,17 +1,6 @@ /* - * Copyright 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2022 Google + * SPDX-License-Identifier: MIT */ #include diff --git a/src/gfxstream/guest/platform/linux/LinuxVirtGpuBlobMapping.cpp b/src/gfxstream/guest/platform/linux/LinuxVirtGpuBlobMapping.cpp index 92c3581b5b0..7b8d3a59b55 100644 --- a/src/gfxstream/guest/platform/linux/LinuxVirtGpuBlobMapping.cpp +++ b/src/gfxstream/guest/platform/linux/LinuxVirtGpuBlobMapping.cpp @@ -1,17 +1,6 @@ /* - * Copyright 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2022 Google + * SPDX-License-Identifier: MIT */ #include diff --git a/src/gfxstream/guest/platform/linux/LinuxVirtGpuDevice.cpp b/src/gfxstream/guest/platform/linux/LinuxVirtGpuDevice.cpp index aefd6e964d2..6a6ad913e78 100644 --- a/src/gfxstream/guest/platform/linux/LinuxVirtGpuDevice.cpp +++ b/src/gfxstream/guest/platform/linux/LinuxVirtGpuDevice.cpp @@ -1,17 +1,6 @@ /* - * Copyright 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2022 Google + * SPDX-License-Identifier: MIT */ #include diff --git a/src/gfxstream/guest/platform/linux/meson.build b/src/gfxstream/guest/platform/linux/meson.build index ccca7573eb4..2f883cf339e 100644 --- a/src/gfxstream/guest/platform/linux/meson.build +++ b/src/gfxstream/guest/platform/linux/meson.build @@ -1,4 +1,4 @@ -# Copyright 2022 Android Open Source Project +# Copyright 2022 Google # SPDX-License-Identifier: MIT files_libplatform_virtgpu_linux = files( diff --git a/src/gfxstream/guest/platform/meson.build b/src/gfxstream/guest/platform/meson.build index 3fad031dd6b..025b33b3bc9 100644 --- a/src/gfxstream/guest/platform/meson.build +++ b/src/gfxstream/guest/platform/meson.build @@ -1,4 +1,4 @@ -# Copyright 2022 Android Open Source Project +# Copyright 2022 Google LLC # SPDX-License-Identifier: MIT inc_platform_virtgpu = include_directories('include') diff --git a/src/gfxstream/guest/vulkan/gfxstream_vk_android.cpp b/src/gfxstream/guest/vulkan/gfxstream_vk_android.cpp index 9b07c2bde6e..2ea6591018c 100644 --- a/src/gfxstream/guest/vulkan/gfxstream_vk_android.cpp +++ b/src/gfxstream/guest/vulkan/gfxstream_vk_android.cpp @@ -1,6 +1,6 @@ /* * Copyright 2023 Google LLC - * SPDX-License-Identifier: Apache-2.0 + * SPDX-License-Identifier: MIT */ #include diff --git a/src/gfxstream/guest/vulkan/gfxstream_vk_cmd.cpp b/src/gfxstream/guest/vulkan/gfxstream_vk_cmd.cpp index fc9be5e10c0..0358ce60b9d 100644 --- a/src/gfxstream/guest/vulkan/gfxstream_vk_cmd.cpp +++ b/src/gfxstream/guest/vulkan/gfxstream_vk_cmd.cpp @@ -1,16 +1,7 @@ -// Copyright (C) 2023 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2023 Google LLC + * SPDX-License-Identifier: MIT + */ #include "ResourceTracker.h" #include "VkEncoder.h" diff --git a/src/gfxstream/guest/vulkan/gfxstream_vk_device.cpp b/src/gfxstream/guest/vulkan/gfxstream_vk_device.cpp index 1822848b777..2970beec683 100644 --- a/src/gfxstream/guest/vulkan/gfxstream_vk_device.cpp +++ b/src/gfxstream/guest/vulkan/gfxstream_vk_device.cpp @@ -1,16 +1,7 @@ -// Copyright (C) 2023 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2023 Google LLC + * SPDX-License-Identifier: MIT + */ #include #include diff --git a/src/gfxstream/guest/vulkan/gfxstream_vk_fuchsia.cpp b/src/gfxstream/guest/vulkan/gfxstream_vk_fuchsia.cpp index edc75acd13d..92c47574a8e 100644 --- a/src/gfxstream/guest/vulkan/gfxstream_vk_fuchsia.cpp +++ b/src/gfxstream/guest/vulkan/gfxstream_vk_fuchsia.cpp @@ -1,6 +1,6 @@ /* * Copyright 2023 Google LLC - * SPDX-License-Identifier: Apache-2.0 + * SPDX-License-Identifier: MIT */ #include diff --git a/src/gfxstream/guest/vulkan/gfxstream_vk_wsi.cpp b/src/gfxstream/guest/vulkan/gfxstream_vk_wsi.cpp index 339826a9823..b9ff9f4bb53 100644 --- a/src/gfxstream/guest/vulkan/gfxstream_vk_wsi.cpp +++ b/src/gfxstream/guest/vulkan/gfxstream_vk_wsi.cpp @@ -1,16 +1,7 @@ -// Copyright (C) 2023 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2023 Google LLC + * SPDX-License-Identifier: MIT + */ #include "gfxstream_vk_entrypoints.h" #include "gfxstream_vk_private.h" diff --git a/src/gfxstream/guest/vulkan/gfxstream_vk_wsi_stub.cpp b/src/gfxstream/guest/vulkan/gfxstream_vk_wsi_stub.cpp index f523a4c2a46..fe0e991b56e 100644 --- a/src/gfxstream/guest/vulkan/gfxstream_vk_wsi_stub.cpp +++ b/src/gfxstream/guest/vulkan/gfxstream_vk_wsi_stub.cpp @@ -1,16 +1,7 @@ -// Copyright (C) 2024 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2023 Google LLC + * SPDX-License-Identifier: MIT + */ #include "gfxstream_vk_entrypoints.h" #include "gfxstream_vk_private.h" diff --git a/src/gfxstream/guest/vulkan/stubs/GfxStreamRenderControl.cpp b/src/gfxstream/guest/vulkan/stubs/GfxStreamRenderControl.cpp index 8283baada41..cf958397b72 100644 --- a/src/gfxstream/guest/vulkan/stubs/GfxStreamRenderControl.cpp +++ b/src/gfxstream/guest/vulkan/stubs/GfxStreamRenderControl.cpp @@ -1,6 +1,6 @@ /* * Copyright 2024 Google LLC - * SPDX-License-Identifier: Apache-2.0 + * SPDX-License-Identifier: MIT */ #include "GfxStreamRenderControl.h" diff --git a/src/gfxstream/guest/vulkan/stubs/GfxStreamRenderControl.h b/src/gfxstream/guest/vulkan/stubs/GfxStreamRenderControl.h index ec42bf3bf58..5f70dc3ee36 100644 --- a/src/gfxstream/guest/vulkan/stubs/GfxStreamRenderControl.h +++ b/src/gfxstream/guest/vulkan/stubs/GfxStreamRenderControl.h @@ -1,6 +1,6 @@ /* * Copyright 2024 Google LLC - * SPDX-License-Identifier: Apache-2.0 + * SPDX-License-Identifier: MIT */ #ifndef GFXSTREAM_RENDER_CONTROL_H diff --git a/src/gfxstream/guest/vulkan_enc/AndroidHardwareBuffer.cpp b/src/gfxstream/guest/vulkan_enc/AndroidHardwareBuffer.cpp index 824d1d213ba..11b7b194402 100644 --- a/src/gfxstream/guest/vulkan_enc/AndroidHardwareBuffer.cpp +++ b/src/gfxstream/guest/vulkan_enc/AndroidHardwareBuffer.cpp @@ -1,17 +1,7 @@ -/// Copyright (C) 2019 The Android Open Source Project -// Copyright (C) 2019 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2019 Google LLC + * SPDX-License-Identifier: MIT + */ #include "AndroidHardwareBuffer.h" #if defined(__ANDROID__) || defined(__linux__) diff --git a/src/gfxstream/guest/vulkan_enc/AndroidHardwareBuffer.h b/src/gfxstream/guest/vulkan_enc/AndroidHardwareBuffer.h index d7137ea25c9..8790a7a4715 100644 --- a/src/gfxstream/guest/vulkan_enc/AndroidHardwareBuffer.h +++ b/src/gfxstream/guest/vulkan_enc/AndroidHardwareBuffer.h @@ -1,17 +1,7 @@ -/// Copyright (C) 2019 The Android Open Source Project -// Copyright (C) 2019 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2019 Google LLC + * SPDX-License-Identifier: MIT + */ #pragma once #if defined(ANDROID) diff --git a/src/gfxstream/guest/vulkan_enc/CommandBufferStagingStream.cpp b/src/gfxstream/guest/vulkan_enc/CommandBufferStagingStream.cpp index f74c5e6da4b..e919344bafa 100644 --- a/src/gfxstream/guest/vulkan_enc/CommandBufferStagingStream.cpp +++ b/src/gfxstream/guest/vulkan_enc/CommandBufferStagingStream.cpp @@ -1,17 +1,6 @@ /* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2021 Google LLC + * SPDX-License-Identifier: MIT */ #include "CommandBufferStagingStream.h" diff --git a/src/gfxstream/guest/vulkan_enc/CommandBufferStagingStream.h b/src/gfxstream/guest/vulkan_enc/CommandBufferStagingStream.h index 45af8dc3adf..aacaae9d2ba 100644 --- a/src/gfxstream/guest/vulkan_enc/CommandBufferStagingStream.h +++ b/src/gfxstream/guest/vulkan_enc/CommandBufferStagingStream.h @@ -1,17 +1,6 @@ /* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2021 Google LLC + * SPDX-License-Identifier: MIT */ #ifndef __COMMAND_BUFFER_STAGING_STREAM_H #define __COMMAND_BUFFER_STAGING_STREAM_H diff --git a/src/gfxstream/guest/vulkan_enc/DescriptorSetVirtualization.cpp b/src/gfxstream/guest/vulkan_enc/DescriptorSetVirtualization.cpp index f422b48c926..c32acc2750d 100644 --- a/src/gfxstream/guest/vulkan_enc/DescriptorSetVirtualization.cpp +++ b/src/gfxstream/guest/vulkan_enc/DescriptorSetVirtualization.cpp @@ -1,17 +1,7 @@ -// Copyright (C) 2021 The Android Open Source Project -// Copyright (C) 2021 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2021 Google LLC + * SPDX-License-Identifier: MIT + */ #include "DescriptorSetVirtualization.h" #include "Resources.h" diff --git a/src/gfxstream/guest/vulkan_enc/DescriptorSetVirtualization.h b/src/gfxstream/guest/vulkan_enc/DescriptorSetVirtualization.h index 0491102b4b9..a2416994bff 100644 --- a/src/gfxstream/guest/vulkan_enc/DescriptorSetVirtualization.h +++ b/src/gfxstream/guest/vulkan_enc/DescriptorSetVirtualization.h @@ -1,17 +1,7 @@ -// Copyright (C) 2021 The Android Open Source Project -// Copyright (C) 2021 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2021 Google LLC + * SPDX-License-Identifier: MIT + */ #pragma once #include diff --git a/src/gfxstream/guest/vulkan_enc/GfxStreamVulkanConnection.cpp b/src/gfxstream/guest/vulkan_enc/GfxStreamVulkanConnection.cpp index 1d98c858789..ec269e6c2f4 100644 --- a/src/gfxstream/guest/vulkan_enc/GfxStreamVulkanConnection.cpp +++ b/src/gfxstream/guest/vulkan_enc/GfxStreamVulkanConnection.cpp @@ -1,6 +1,6 @@ /* * Copyright 2024 Google LLC - * SPDX-License-Identifier: Apache-2.0 + * SPDX-License-Identifier: MIT */ #include "GfxStreamVulkanConnection.h" diff --git a/src/gfxstream/guest/vulkan_enc/GfxStreamVulkanConnection.h b/src/gfxstream/guest/vulkan_enc/GfxStreamVulkanConnection.h index e16c14d6531..7a018a00e7b 100644 --- a/src/gfxstream/guest/vulkan_enc/GfxStreamVulkanConnection.h +++ b/src/gfxstream/guest/vulkan_enc/GfxStreamVulkanConnection.h @@ -1,16 +1,7 @@ -// Copyright (C) 2024 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2024 Google LLC + * SPDX-License-Identifier: MIT + */ #ifndef GFXSTREAM_VULKAN_CONNECTION_H #define GFXSTREAM_VULKAN_CONNECTION_H diff --git a/src/gfxstream/guest/vulkan_enc/HostVisibleMemoryVirtualization.cpp b/src/gfxstream/guest/vulkan_enc/HostVisibleMemoryVirtualization.cpp index a19a20df1f6..68a8fb20380 100644 --- a/src/gfxstream/guest/vulkan_enc/HostVisibleMemoryVirtualization.cpp +++ b/src/gfxstream/guest/vulkan_enc/HostVisibleMemoryVirtualization.cpp @@ -1,17 +1,7 @@ -// Copyright (C) 2018 The Android Open Source Project -// Copyright (C) 2018 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2018 Google + * SPDX-License-Identifier: MIT + */ #include "HostVisibleMemoryVirtualization.h" #include diff --git a/src/gfxstream/guest/vulkan_enc/HostVisibleMemoryVirtualization.h b/src/gfxstream/guest/vulkan_enc/HostVisibleMemoryVirtualization.h index 397f5dc115a..ac3c46490c2 100644 --- a/src/gfxstream/guest/vulkan_enc/HostVisibleMemoryVirtualization.h +++ b/src/gfxstream/guest/vulkan_enc/HostVisibleMemoryVirtualization.h @@ -1,17 +1,7 @@ -// Copyright (C) 2018 The Android Open Source Project -// Copyright (C) 2018 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2018 Google + * SPDX-License-Identifier: MIT + */ #pragma once #include diff --git a/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp b/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp index 05ba9be7d2d..8a49d374ce0 100644 --- a/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp +++ b/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp @@ -1,17 +1,7 @@ -// Copyright (C) 2018 The Android Open Source Project -// Copyright (C) 2018 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2018 Google + * SPDX-License-Identifier: MIT + */ #include "ResourceTracker.h" diff --git a/src/gfxstream/guest/vulkan_enc/ResourceTracker.h b/src/gfxstream/guest/vulkan_enc/ResourceTracker.h index 4be8d4f9e5a..c7c434026be 100644 --- a/src/gfxstream/guest/vulkan_enc/ResourceTracker.h +++ b/src/gfxstream/guest/vulkan_enc/ResourceTracker.h @@ -1,17 +1,7 @@ -// Copyright (C) 2018 The Android Open Source Project -// Copyright (C) 2018 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2018 Google + * SPDX-License-Identifier: MIT + */ #pragma once #include diff --git a/src/gfxstream/guest/vulkan_enc/Resources.cpp b/src/gfxstream/guest/vulkan_enc/Resources.cpp index dcccc3e060c..ccc59a9e6c6 100644 --- a/src/gfxstream/guest/vulkan_enc/Resources.cpp +++ b/src/gfxstream/guest/vulkan_enc/Resources.cpp @@ -1,16 +1,7 @@ -// Copyright (C) 2018 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2018 Google LLC + * SPDX-License-Identifier: MIT + */ #include "Resources.h" #include diff --git a/src/gfxstream/guest/vulkan_enc/Resources.h b/src/gfxstream/guest/vulkan_enc/Resources.h index 1166da4fd74..8b5222db3d8 100644 --- a/src/gfxstream/guest/vulkan_enc/Resources.h +++ b/src/gfxstream/guest/vulkan_enc/Resources.h @@ -1,16 +1,7 @@ -// Copyright (C) 2018 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2018 Google + * SPDX-License-Identifier: MIT + */ #pragma once #if defined(__ANDROID__) || defined(__Fuchsia__) diff --git a/src/gfxstream/guest/vulkan_enc/Validation.cpp b/src/gfxstream/guest/vulkan_enc/Validation.cpp index 00652fcb30b..d21fe6630ac 100644 --- a/src/gfxstream/guest/vulkan_enc/Validation.cpp +++ b/src/gfxstream/guest/vulkan_enc/Validation.cpp @@ -1,16 +1,7 @@ -// Copyright (C) 2018 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2018 Google + * SPDX-License-Identifier: MIT + */ #include "Validation.h" #include "ResourceTracker.h" diff --git a/src/gfxstream/guest/vulkan_enc/Validation.h b/src/gfxstream/guest/vulkan_enc/Validation.h index e4ebc5f0ee7..a0d903ed9f3 100644 --- a/src/gfxstream/guest/vulkan_enc/Validation.h +++ b/src/gfxstream/guest/vulkan_enc/Validation.h @@ -1,16 +1,7 @@ -// Copyright (C) 2018 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2018 Google + * SPDX-License-Identifier: MIT + */ #pragma once #include diff --git a/src/gfxstream/guest/vulkan_enc/VkEncoder.cpp.inl b/src/gfxstream/guest/vulkan_enc/VkEncoder.cpp.inl index cfa1c86129d..f533707a382 100644 --- a/src/gfxstream/guest/vulkan_enc/VkEncoder.cpp.inl +++ b/src/gfxstream/guest/vulkan_enc/VkEncoder.cpp.inl @@ -1,3 +1,8 @@ +/* + * Copyright 2018 Google + * SPDX-License-Identifier: MIT + */ + static ResourceTracker* sResourceTracker = nullptr; static uint32_t sFeatureBits = 0; static constexpr uint32_t kWatchdogBufferMax = 1'000; diff --git a/src/gfxstream/guest/vulkan_enc/VkEncoder.h.inl b/src/gfxstream/guest/vulkan_enc/VkEncoder.h.inl index fc698d48fdb..368533ab491 100644 --- a/src/gfxstream/guest/vulkan_enc/VkEncoder.h.inl +++ b/src/gfxstream/guest/vulkan_enc/VkEncoder.h.inl @@ -1,3 +1,7 @@ +/* + * Copyright 2018 Google + * SPDX-License-Identifier: MIT + */ void flush(); void lock(); void unlock(); diff --git a/src/gfxstream/guest/vulkan_enc/VulkanHandleMapping.cpp b/src/gfxstream/guest/vulkan_enc/VulkanHandleMapping.cpp index 1b5c6a6691e..0760b074ec5 100644 --- a/src/gfxstream/guest/vulkan_enc/VulkanHandleMapping.cpp +++ b/src/gfxstream/guest/vulkan_enc/VulkanHandleMapping.cpp @@ -1,17 +1,7 @@ -// Copyright (C) 2018 The Android Open Source Project -// Copyright (C) 2018 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2018 Google LLC + * SPDX-License-Identifier: MIT + */ #include "VulkanHandleMapping.h" #include diff --git a/src/gfxstream/guest/vulkan_enc/VulkanHandleMapping.h b/src/gfxstream/guest/vulkan_enc/VulkanHandleMapping.h index 08c229e7479..4fd698e2cb4 100644 --- a/src/gfxstream/guest/vulkan_enc/VulkanHandleMapping.h +++ b/src/gfxstream/guest/vulkan_enc/VulkanHandleMapping.h @@ -1,17 +1,7 @@ -// Copyright (C) 2018 The Android Open Source Project -// Copyright (C) 2018 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2018 Google LLC + * SPDX-License-Identifier: MIT + */ #pragma once #include @@ -50,4 +40,4 @@ class DefaultHandleMapping : public VulkanHandleMapping { }; } // namespace vk -} // namespace gfxstream \ No newline at end of file +} // namespace gfxstream diff --git a/src/gfxstream/guest/vulkan_enc/VulkanHandles.h b/src/gfxstream/guest/vulkan_enc/VulkanHandles.h index 1be4d7045b1..b026ce59f2a 100644 --- a/src/gfxstream/guest/vulkan_enc/VulkanHandles.h +++ b/src/gfxstream/guest/vulkan_enc/VulkanHandles.h @@ -1,17 +1,7 @@ -// Copyright (C) 2018 The Android Open Source Project -// Copyright (C) 2018 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2018 Google LLC + * SPDX-License-Identifier: MIT + */ #pragma once #include diff --git a/src/gfxstream/guest/vulkan_enc/VulkanStreamGuest.cpp b/src/gfxstream/guest/vulkan_enc/VulkanStreamGuest.cpp index 67d8769a833..2891b5d5089 100644 --- a/src/gfxstream/guest/vulkan_enc/VulkanStreamGuest.cpp +++ b/src/gfxstream/guest/vulkan_enc/VulkanStreamGuest.cpp @@ -1,16 +1,7 @@ -// Copyright (C) 2018 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2018 Google LLC + * SPDX-License-Identifier: MIT + */ #include "VulkanStreamGuest.h" #include "util/log.h" diff --git a/src/gfxstream/guest/vulkan_enc/VulkanStreamGuest.h b/src/gfxstream/guest/vulkan_enc/VulkanStreamGuest.h index be70daf61d7..b6668f04b43 100644 --- a/src/gfxstream/guest/vulkan_enc/VulkanStreamGuest.h +++ b/src/gfxstream/guest/vulkan_enc/VulkanStreamGuest.h @@ -1,16 +1,7 @@ -// Copyright (C) 2018 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2018 Google LLC + * SPDX-License-Identifier: MIT + */ #pragma once #include diff --git a/src/gfxstream/guest/vulkan_enc/gfxstream_vk_private.cpp b/src/gfxstream/guest/vulkan_enc/gfxstream_vk_private.cpp index f6c7cf6a671..d1e0c8349b2 100644 --- a/src/gfxstream/guest/vulkan_enc/gfxstream_vk_private.cpp +++ b/src/gfxstream/guest/vulkan_enc/gfxstream_vk_private.cpp @@ -1,16 +1,7 @@ -// Copyright (C) 2023 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2023 Google LLC + * SPDX-License-Identifier: MIT + */ #include "gfxstream_vk_private.h" diff --git a/src/gfxstream/guest/vulkan_enc/goldfish_vk_private_defs.h b/src/gfxstream/guest/vulkan_enc/goldfish_vk_private_defs.h index d50e6f1189f..76a6dce6ced 100644 --- a/src/gfxstream/guest/vulkan_enc/goldfish_vk_private_defs.h +++ b/src/gfxstream/guest/vulkan_enc/goldfish_vk_private_defs.h @@ -1,10 +1,7 @@ -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2018 Google + * SPDX-License-Identifier: MIT + */ #pragma once #include diff --git a/src/gfxstream/guest/vulkan_enc/vkQueueFlushCommandsGOOGLE_encode_impl.cpp.inl b/src/gfxstream/guest/vulkan_enc/vkQueueFlushCommandsGOOGLE_encode_impl.cpp.inl index 75fb7a8ad2c..25803113a6d 100644 --- a/src/gfxstream/guest/vulkan_enc/vkQueueFlushCommandsGOOGLE_encode_impl.cpp.inl +++ b/src/gfxstream/guest/vulkan_enc/vkQueueFlushCommandsGOOGLE_encode_impl.cpp.inl @@ -1,7 +1,7 @@ -// Manual inline for -// void VkEncoder::vkQueueFlushCommandsGOOGLE( VkQueue queue, VkCommandBuffer commandBuffer, VkDeviceSize dataSize, const void* pData, uint32_t doLock); - -// We won't use the lock if this command is used (VulkanQueueSubmitWithCommands is enabled) +/* + * Copyright 2018 Google LLC + * SPDX-License-Identifier: MIT + */ (void)doLock; auto stream = mImpl->stream(); diff --git a/src/gfxstream/guest/vulkan_enc/vk_format_info.h b/src/gfxstream/guest/vulkan_enc/vk_format_info.h index f6c560fbe57..fbdeb340f16 100644 --- a/src/gfxstream/guest/vulkan_enc/vk_format_info.h +++ b/src/gfxstream/guest/vulkan_enc/vk_format_info.h @@ -1,28 +1,7 @@ /* - * Copyright © 2016 Intel Corporation - * Copyright © 2019 The Android Open Source Project - * Copyright © 2019 Google Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. + * Copyright 2016 Intel + * SPDX-License-Identifier: MIT */ - #ifndef VK_FORMAT_INFO_H #define VK_FORMAT_INFO_H diff --git a/src/gfxstream/guest/vulkan_enc/vk_platform_compat.h b/src/gfxstream/guest/vulkan_enc/vk_platform_compat.h index 38f78cd1d1f..9bbe44c39d7 100644 --- a/src/gfxstream/guest/vulkan_enc/vk_platform_compat.h +++ b/src/gfxstream/guest/vulkan_enc/vk_platform_compat.h @@ -1,16 +1,7 @@ -// Copyright (C) 2018 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2018 Google LLC + * SPDX-License-Identifier: MIT + */ #pragma once #include diff --git a/src/gfxstream/guest/vulkan_enc/vk_struct_id.h b/src/gfxstream/guest/vulkan_enc/vk_struct_id.h index 9bcca28dfe7..15a814243a3 100644 --- a/src/gfxstream/guest/vulkan_enc/vk_struct_id.h +++ b/src/gfxstream/guest/vulkan_enc/vk_struct_id.h @@ -1,17 +1,7 @@ -// Copyright (C) 2018 The Android Open Source Project -// Copyright (C) 2018 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2018 Google LLC + * SPDX-License-Identifier: MIT + */ #pragma once #include diff --git a/src/gfxstream/guest/vulkan_enc/vk_util.h b/src/gfxstream/guest/vulkan_enc/vk_util.h index 4639064543f..fb8b9c5ef35 100644 --- a/src/gfxstream/guest/vulkan_enc/vk_util.h +++ b/src/gfxstream/guest/vulkan_enc/vk_util.h @@ -1,24 +1,6 @@ /* - * Copyright © 2017 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. + * Copyright 2017 Intel + * SPDX-License-Identifier: MIT */ #ifndef VK_UTIL_H #define VK_UTIL_H