From 7d1a1c52a7370ab846dcf28afc103939400a1198 Mon Sep 17 00:00:00 2001 From: Alexander Koskovich Date: Wed, 18 May 2022 09:08:50 -0700 Subject: [PATCH] dre: Switch to SPDX license identifiers * Might as well be consistent. Change-Id: Ib95789a0286785ba3b0b6df265291e87a13d2ef8 --- Android.mk | 12 +----------- BoardConfig.mk | 12 +----------- bootctrl/Android.bp | 15 ++------------- device.mk | 12 +----------- gpt-utils/Android.bp | 14 +------------- .../hardware/oplus/doze/res/values/config.xml | 13 +------------ .../lineage-sdk/lineage/res/res/values/config.xml | 13 +------------ .../res/values/defaults.xml | 13 +------------ .../dialer/callrecord/res/values/config.xml | 13 +------------ 9 files changed, 10 insertions(+), 107 deletions(-) diff --git a/Android.mk b/Android.mk index c366165..ac2e5cf 100644 --- a/Android.mk +++ b/Android.mk @@ -1,17 +1,7 @@ # # Copyright (C) 2021-2022 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-License-Identifier: Apache-2.0 # LOCAL_PATH := $(call my-dir) diff --git a/BoardConfig.mk b/BoardConfig.mk index cef486b..2fcbe52 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -1,17 +1,7 @@ # # Copyright (C) 2021-2022 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-License-Identifier: Apache-2.0 # BUILD_BROKEN_DUP_RULES := true diff --git a/bootctrl/Android.bp b/bootctrl/Android.bp index 0f412aa..abbc204 100644 --- a/bootctrl/Android.bp +++ b/bootctrl/Android.bp @@ -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 (C) 2018-2022 The Android Open Source Project +// SPDX-License-Identifier: Apache-2.0 // cc_library { diff --git a/device.mk b/device.mk index 65af4fc..1413940 100644 --- a/device.mk +++ b/device.mk @@ -1,17 +1,7 @@ # # Copyright (C) 2021-2022 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-License-Identifier: Apache-2.0 # # Enable project quotas and casefolding for emulated storage without sdcardfs diff --git a/gpt-utils/Android.bp b/gpt-utils/Android.bp index ca01f22..5dcae12 100644 --- a/gpt-utils/Android.bp +++ b/gpt-utils/Android.bp @@ -1,19 +1,7 @@ // // Copyright (C) 2018 The Android Open Source Project +// SPDX-License-Identifier: Apache-2.0 // -// 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. -// - cc_library { name: "libgptutils.oneplus_holi", diff --git a/overlay-lineage/hardware/oplus/doze/res/values/config.xml b/overlay-lineage/hardware/oplus/doze/res/values/config.xml index e2224bd..b9c1fef 100644 --- a/overlay-lineage/hardware/oplus/doze/res/values/config.xml +++ b/overlay-lineage/hardware/oplus/doze/res/values/config.xml @@ -1,18 +1,7 @@ diff --git a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml b/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml index 8554511..e0612db 100644 --- a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml +++ b/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml @@ -2,18 +2,7 @@ diff --git a/overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml b/overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml index da46c31..2cbeb77 100644 --- a/overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml +++ b/overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml @@ -1,18 +1,7 @@ true