[licenses] Select Apache-2.0 license and update Android.bp
This change re-licenses several dual-licensed files as Apache 2.0.
It also updates the license_kinds set defined in Android.bp to use
the results of a more recent scanner tool run.
Change-Id: I9231ce3b2e03bfd0de0b8d4f011e0394e845a771
diff --git a/Android.bp b/Android.bp
index 8ba628d..8a018c1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -28,20 +28,10 @@
license_kinds: [
"SPDX-license-identifier-Apache-2.0",
"SPDX-license-identifier-BSD",
- "SPDX-license-identifier-CC-BY",
- "SPDX-license-identifier-GPL",
- "SPDX-license-identifier-GPL-2.0",
- "SPDX-license-identifier-GPL-3.0",
"SPDX-license-identifier-ISC",
- "SPDX-license-identifier-LGPL",
"SPDX-license-identifier-MIT",
- "SPDX-license-identifier-OFL", // by exception only
- "SPDX-license-identifier-Zlib",
- "legacy_by_exception_only", // by exception only
- "legacy_notice",
"legacy_unencumbered",
],
- // large-scale-change unable to identify any license_text files
}
cc_library_headers {
diff --git a/fake-android-guest/cutils/ashmem.h b/fake-android-guest/cutils/ashmem.h
index d80caa6..072b397 100644
--- a/fake-android-guest/cutils/ashmem.h
+++ b/fake-android-guest/cutils/ashmem.h
@@ -1,11 +1,16 @@
-/* cutils/ashmem.h
- **
- ** Copyright 2008 The Android Open Source Project
- **
- ** This file is dual licensed. It may be redistributed and/or modified
- ** under the terms of the Apache 2.0 License OR version 2 of the GNU
- ** General Public License.
- */
+// Copyright (C) 2008 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.
#ifndef _CUTILS_ASHMEM_H
#define _CUTILS_ASHMEM_H
diff --git a/fake-android-guest/log/log_properties.h b/fake-android-guest/log/log_properties.h
index 7d398a6..23fc37e 100644
--- a/fake-android-guest/log/log_properties.h
+++ b/fake-android-guest/log/log_properties.h
@@ -1,11 +1,16 @@
-/*
-**
-** Copyright 2017, The Android Open Source Project
-**
-** This file is dual licensed. It may be redistributed and/or modified
-** under the terms of the Apache 2.0 License OR version 2 of the GNU
-** General Public License.
-*/
+// Copyright (C) 2017 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.
#ifndef _LIBS_LOG_PROPERTIES_H
#define _LIBS_LOG_PROPERTIES_H
diff --git a/fake-android-guest/log/log_safetynet.h b/fake-android-guest/log/log_safetynet.h
index 07e8c8a..390d838 100644
--- a/fake-android-guest/log/log_safetynet.h
+++ b/fake-android-guest/log/log_safetynet.h
@@ -1,11 +1,16 @@
-/*
-**
-** Copyright 2017, The Android Open Source Project
-**
-** This file is dual licensed. It may be redistributed and/or modified
-** under the terms of the Apache 2.0 License OR version 2 of the GNU
-** General Public License.
-*/
+// Copyright (C) 2017 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.
#ifndef _LIBS_LOG_SAFETYNET_H
#define _LIBS_LOG_SAFETYNET_H
diff --git a/fake-android-guest/log/log_transport.h b/fake-android-guest/log/log_transport.h
index 80b30db..5d7d49e 100644
--- a/fake-android-guest/log/log_transport.h
+++ b/fake-android-guest/log/log_transport.h
@@ -1,11 +1,16 @@
-/*
-**
-** Copyright 2017, The Android Open Source Project
-**
-** This file is dual licensed. It may be redistributed and/or modified
-** under the terms of the Apache 2.0 License OR version 2 of the GNU
-** General Public License.
-*/
+// Copyright (C) 2017 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.
#ifndef _LIBS_LOG_TRANSPORT_H
#define _LIBS_LOG_TRANSPORT_H
