From ff25ca675ec623cb5244a48f06adc4d8dddde5ff Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Fri, 20 Jun 2025 22:19:26 -0400 Subject: [PATCH] evert: Switch to SPDX copyright * Also drop copyright years Change-Id: Iad4e7727ca76e5b9640a8a7f90737b2ce7a4c517 --- Android.bp | 5 +++++ AndroidProducts.mk | 15 ++------------- BoardConfig.mk | 15 ++------------- README.md | 12 ++++++++++-- device.mk | 15 ++------------- extract-files.py | 2 +- init/Android.bp | 2 +- lineage_evert.mk | 5 +++++ .../device/Frameworks/res/values/dimens.xml | 17 +++-------------- .../Frameworks/res/xml/power_profile.xml | 5 +++++ .../device/Settings/res/values/config.xml | 16 +++------------- .../SettingsProvider/res/values/defaults.xml | 18 +++--------------- setup-makefiles.py | 4 ++++ 13 files changed, 46 insertions(+), 85 deletions(-) diff --git a/Android.bp b/Android.bp index 08c39ef..9489521 100644 --- a/Android.bp +++ b/Android.bp @@ -1,3 +1,8 @@ +// +// SPDX-FileCopyrightText: The LineageOS Project +// SPDX-License-Identifier: Apache-2.0 +// + soong_namespace { imports: [ "vendor/motorola/evert", diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 23a97e1..9f820f8 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -1,17 +1,6 @@ # -# Copyright (C) 2017-2019 The LineageOS 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. +# SPDX-FileCopyrightText: The LineageOS Project +# SPDX-License-Identifier: Apache-2.0 # PRODUCT_MAKEFILES := \ diff --git a/BoardConfig.mk b/BoardConfig.mk index 8f69529..6f68a60 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -1,17 +1,6 @@ # -# Copyright (C) 2017 The LineageOS 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. +# SPDX-FileCopyrightText: The LineageOS Project +# SPDX-License-Identifier: Apache-2.0 # # Must set these before including common config diff --git a/README.md b/README.md index c4c78c6..1ecd251 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ -Copyright 2018 - The LineageOS Project - Device configuration for Motorola G6 Plus (evert) ================================== @@ -18,3 +16,13 @@ Rear Camera | 12 MP (f/1.7) + 5 MP (f/2.2), (PDAF, dual pixel) Front Camera | 8 MP (f/2.2) ![Motorola G6 Plus](https://cdn2.gsmarena.com/vv/pics/motorola/motorola-moto-g6-plus-2.jpg "Motorola G6 Plus") + + +``` + +SPDX-FileCopyrightText: The LineageOS Project + +SPDX-License-Identifier: Apache-2.0 + +``` + diff --git a/device.mk b/device.mk index 3f63c7f..debdab1 100644 --- a/device.mk +++ b/device.mk @@ -1,17 +1,6 @@ # -# Copyright (C) 2018 The LineageOS 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. +# SPDX-FileCopyrightText: The LineageOS Project +# SPDX-License-Identifier: Apache-2.0 # # Vendor blobs diff --git a/extract-files.py b/extract-files.py index 4bd44f1..a09f530 100755 --- a/extract-files.py +++ b/extract-files.py @@ -1,6 +1,6 @@ #!/usr/bin/env -S PYTHONPATH=../../../tools/extract-utils python3 # -# SPDX-FileCopyrightText: 2024 The LineageOS Project +# SPDX-FileCopyrightText: The LineageOS Project # SPDX-License-Identifier: Apache-2.0 # diff --git a/init/Android.bp b/init/Android.bp index fb2f5c8..55fc7a1 100644 --- a/init/Android.bp +++ b/init/Android.bp @@ -1,5 +1,5 @@ // -// SPDX-FileCopyrightText: 2024 The LineageOS Project +// SPDX-FileCopyrightText: The LineageOS Project // SPDX-License-Identifier: Apache-2.0 // diff --git a/lineage_evert.mk b/lineage_evert.mk index 9277fdf..c54ec29 100644 --- a/lineage_evert.mk +++ b/lineage_evert.mk @@ -1,3 +1,8 @@ +# +# SPDX-FileCopyrightText: The LineageOS Project +# SPDX-License-Identifier: Apache-2.0 +# + # Inherit some common Lineage stuff. $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, vendor/lineage/config/common_full_phone.mk) diff --git a/resource-overlay/device/Frameworks/res/values/dimens.xml b/resource-overlay/device/Frameworks/res/values/dimens.xml index f0de56b..bd14105 100644 --- a/resource-overlay/device/Frameworks/res/values/dimens.xml +++ b/resource-overlay/device/Frameworks/res/values/dimens.xml @@ -1,20 +1,9 @@ + 26.0px diff --git a/resource-overlay/device/Frameworks/res/xml/power_profile.xml b/resource-overlay/device/Frameworks/res/xml/power_profile.xml index 89a017a..a771d10 100644 --- a/resource-overlay/device/Frameworks/res/xml/power_profile.xml +++ b/resource-overlay/device/Frameworks/res/xml/power_profile.xml @@ -1,4 +1,9 @@ + + 0 101.378 diff --git a/resource-overlay/device/Settings/res/values/config.xml b/resource-overlay/device/Settings/res/values/config.xml index fd5449d..1e9525b 100644 --- a/resource-overlay/device/Settings/res/values/config.xml +++ b/resource-overlay/device/Settings/res/values/config.xml @@ -1,17 +1,7 @@ - diff --git a/resource-overlay/device/SettingsProvider/res/values/defaults.xml b/resource-overlay/device/SettingsProvider/res/values/defaults.xml index 4b9b0c6..d34041d 100644 --- a/resource-overlay/device/SettingsProvider/res/values/defaults.xml +++ b/resource-overlay/device/SettingsProvider/res/values/defaults.xml @@ -1,21 +1,9 @@ + moto g(6) plus diff --git a/setup-makefiles.py b/setup-makefiles.py index 32947cf..e75e199 100755 --- a/setup-makefiles.py +++ b/setup-makefiles.py @@ -1 +1,5 @@ #!./extract-files.py --regenerate_makefiles +# +# SPDX-FileCopyrightText: The LineageOS Project +# SPDX-License-Identifier: Apache-2.0 +#