tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "[LSC] Add LOCAL_LICENSE_KINDS to bionic"

Browse source 
This reverts commit 48d43034d7.

Reason for revert: bionic is multiple projects, not just one.

Change-Id: Ib31e1bb8888cc85c6e7736c4e2a1d4652fd23935
This commit is contained in:
Elliott Hughes 2021-02-16 20:02:47 +00:00
parent 48d43034d7
commit 5e44c22ebf
25 changed files with 1 additions and 321 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
Android.bp
View file

@ -1,46 +0,0 @@
//
// 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.
package {
default_applicable_licenses: ["bionic_license"],
}
// Added automatically by a large-scale-change that took the approach of
// 'apply every license found to every target'. While this makes sure we respect
// every license restriction, it may not be entirely correct.
//
// e.g. GPL in an MIT project might only apply to the contrib/ directory.
//
// Please consider splitting the single license below into multiple licenses,
// taking care not to lose any license_kind information, and overriding the
// default license using the 'licenses: [...]' property on targets as needed.
//
// For unused files, consider creating a 'fileGroup' with "//visibility:private"
// to attach the license to, and including a comment whether the files may be
// used in the current project.
// See: http://go/android-license-faq
license {
name: "bionic_license",
visibility: [":__subpackages__"],
license_kinds: [
"SPDX-license-identifier-Apache-2.0",
"SPDX-license-identifier-BSD",
"SPDX-license-identifier-ISC",
"SPDX-license-identifier-MIT",
"legacy_notice",
"legacy_unencumbered",
],
// large-scale-change unable to identify any license_text files
}

9
apex/Android.bp
View file

@ -3,15 +3,6 @@
// In Q this contained Bionic, ART and Libcore.
// It keeps the name /apex/com.android.runtime for app compat reasons.
package {
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
// all of the 'license_kinds' from "bionic_license"
// to get the below license kinds:
// legacy_notice
default_applicable_licenses: ["bionic_license"],
}
android_app_certificate {
name: "com.android.runtime.certificate",
certificate: "com.android.runtime",

10
benchmarks/Android.bp
View file

@ -14,16 +14,6 @@
// limitations under the License.
//
package {
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
// all of the 'license_kinds' from "bionic_license"
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
// SPDX-license-identifier-BSD
default_applicable_licenses: ["bionic_license"],
}
cc_defaults {
name: "bionic-benchmarks-defaults",
cflags: [

9
benchmarks/linker_relocation/Android.bp
View file

@ -24,15 +24,6 @@
// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
// SUCH DAMAGE.
package {
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
// all of the 'license_kinds' from "bionic_license"
// to get the below license kinds:
// SPDX-license-identifier-BSD
default_applicable_licenses: ["bionic_license"],
}
cc_library_headers {
name: "linker_reloc_bench_headers",
defaults: ["bionic_spawn_benchmark_targets"],

9
benchmarks/linker_relocation/gen/Android.bp
View file

@ -1,13 +1,4 @@
// AUTO-GENERATED BY gen_bench.py -- do not edit
package {
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
// all of the 'license_kinds' from "bionic_license"
// to get the below license kinds:
// legacy_notice
default_applicable_licenses: ["bionic_license"],
}
cc_defaults {
name: "linker_reloc_bench_all_libs",
runtime_libs: [

9
benchmarks/spawn/Android.bp
View file

@ -26,15 +26,6 @@
// SUCH DAMAGE.
//
package {
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
// all of the 'license_kinds' from "bionic_license"
// to get the below license kinds:
// SPDX-license-identifier-BSD
default_applicable_licenses: ["bionic_license"],
}
cc_defaults {
name: "bionic_spawn_benchmark_targets",
host_supported: true,

34
libc/Android.bp
View file

@ -1,39 +1,5 @@
// Define the common source files for all the libc instances
// =========================================================
package {
default_applicable_licenses: ["bionic_libc_license"],
}
// Added automatically by a large-scale-change that took the approach of
// 'apply every license found to every target'. While this makes sure we respect
// every license restriction, it may not be entirely correct.
//
// e.g. GPL in an MIT project might only apply to the contrib/ directory.
//
// Please consider splitting the single license below into multiple licenses,
// taking care not to lose any license_kind information, and overriding the
// default license using the 'licenses: [...]' property on targets as needed.
//
// For unused files, consider creating a 'fileGroup' with "//visibility:private"
// to attach the license to, and including a comment whether the files may be
// used in the current project.
// See: http://go/android-license-faq
license {
name: "bionic_libc_license",
visibility: [":__subpackages__"],
license_kinds: [
"SPDX-license-identifier-Apache-2.0",
"SPDX-license-identifier-BSD",
"SPDX-license-identifier-ISC",
"SPDX-license-identifier-MIT",
"legacy_notice",
"legacy_unencumbered",
],
license_text: [
"NOTICE",
],
}
libc_common_src_files = [
"async_safe/async_safe_log.cpp",
"bionic/ether_aton.c",

9
libc/async_safe/Android.bp
View file

@ -1,15 +1,6 @@
// ========================================================
// libasync_safe.a
// ========================================================
package {
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
// all of the 'license_kinds' from "bionic_libc_license"
// to get the below license kinds:
// SPDX-license-identifier-BSD
default_applicable_licenses: ["bionic_libc_license"],
}
cc_library_static {
defaults: ["libc_defaults"],
srcs: [

10
libc/malloc_debug/Android.bp
View file

@ -2,16 +2,6 @@
// libc_malloc_debug_backtrace.a
// ==============================================================
// Used by libmemunreachable
package {
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
// all of the 'license_kinds' from "bionic_libc_license"
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
// SPDX-license-identifier-BSD
default_applicable_licenses: ["bionic_libc_license"],
}
cc_library_static {
name: "libc_malloc_debug_backtrace",
vendor_available: true,

9
libc/malloc_hooks/Android.bp
View file

@ -1,15 +1,6 @@
// ==============================================================
// libc_malloc_hooks.so
// ==============================================================
package {
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
// all of the 'license_kinds' from "bionic_libc_license"
// to get the below license kinds:
// SPDX-license-identifier-BSD
default_applicable_licenses: ["bionic_libc_license"],
}
cc_library {
name: "libc_malloc_hooks",

10
libc/system_properties/Android.bp
View file

@ -1,13 +1,3 @@
package {
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
// all of the 'license_kinds' from "bionic_libc_license"
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
// SPDX-license-identifier-BSD
default_applicable_licenses: ["bionic_libc_license"],
}
cc_library_static {
name: "libsystemproperties",
defaults: ["libc_defaults"],

10
libc/tools/Android.bp
View file

@ -1,13 +1,3 @@
package {
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
// all of the 'license_kinds' from "bionic_libc_license"
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
// legacy_unencumbered
default_applicable_licenses: ["bionic_libc_license"],
}
filegroup {
name: "bionic-gensyscalls",
srcs: ["gensyscalls.py"]

17
libdl/Android.bp
View file

@ -1,23 +1,6 @@
//
// libdl
//
package {
default_applicable_licenses: ["bionic_libdl_license"],
}
// Added automatically by a large-scale-change
// See: http://go/android-license-faq
license {
name: "bionic_libdl_license",
visibility: [":__subpackages__"],
license_kinds: [
"SPDX-license-identifier-Apache-2.0",
],
license_text: [
"NOTICE",
],
}
cc_library_static {
name: "libdl_static",
defaults: ["linux_bionic_supported"],

9
libfdtrack/Android.bp
View file

@ -1,12 +1,3 @@
package {
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
// all of the 'license_kinds' from "bionic_license"
// to get the below license kinds:
// SPDX-license-identifier-BSD
default_applicable_licenses: ["bionic_license"],
}
cc_library_shared {
name: "libfdtrack",
srcs: ["fdtrack.cpp"],

12
libm/Android.bp
View file

@ -1,18 +1,6 @@
//
// libm.so and libm.a for target.
//
package {
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
// all of the 'license_kinds' from "bionic_license"
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
// SPDX-license-identifier-BSD
// SPDX-license-identifier-MIT
// legacy_unencumbered
default_applicable_licenses: ["bionic_license"],
}
cc_library {
name: "libm",
defaults: ["linux_bionic_supported"],

30
linker/Android.bp
View file

@ -9,36 +9,6 @@
// embedded as the entry point, and the linker is embedded as ELF sections in
// each binary. There's a linker script that sets all of that up (generated by
// extract_linker), and defines the extern symbols used in this file.
package {
default_applicable_licenses: ["bionic_linker_license"],
}
// Added automatically by a large-scale-change that took the approach of
// 'apply every license found to every target'. While this makes sure we respect
// every license restriction, it may not be entirely correct.
//
// e.g. GPL in an MIT project might only apply to the contrib/ directory.
//
// Please consider splitting the single license below into multiple licenses,
// taking care not to lose any license_kind information, and overriding the
// default license using the 'licenses: [...]' property on targets as needed.
//
// For unused files, consider creating a 'fileGroup' with "//visibility:private"
// to attach the license to, and including a comment whether the files may be
// used in the current project.
// See: http://go/android-license-faq
license {
name: "bionic_linker_license",
visibility: [":__subpackages__"],
license_kinds: [
"SPDX-license-identifier-Apache-2.0",
"SPDX-license-identifier-BSD",
],
license_text: [
"NOTICE",
],
}
cc_object {
name: "linker_wrapper",
host_supported: true,

10
tests/Android.bp
View file

@ -14,16 +14,6 @@
// limitations under the License.
//
package {
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
// all of the 'license_kinds' from "bionic_license"
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
// SPDX-license-identifier-BSD
default_applicable_licenses: ["bionic_license"],
}
cc_defaults {
name: "bionic_tests_defaults",
host_supported: true,

9
tests/headers/Android.bp
View file

@ -1,10 +1 @@
package {
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
// all of the 'license_kinds' from "bionic_license"
// to get the below license kinds:
// SPDX-license-identifier-BSD
default_applicable_licenses: ["bionic_license"],
}
subdirs = ["*"]

9
tests/headers/posix/Android.bp
View file

@ -14,15 +14,6 @@
// limitations under the License.
//
package {
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
// all of the 'license_kinds' from "bionic_license"
// to get the below license kinds:
// SPDX-license-identifier-BSD
default_applicable_licenses: ["bionic_license"],
}
cc_library_static {
name: "libbionic_tests_headers_posix",
srcs: ["*.c"],

10
tests/libs/Android.bp
View file

@ -14,16 +14,6 @@
// limitations under the License.
//
package {
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
// all of the 'license_kinds' from "bionic_license"
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
// SPDX-license-identifier-BSD
default_applicable_licenses: ["bionic_license"],
}
cc_defaults {
name: "bionic_testlib_defaults",
host_supported: true,

5
tests/libs/Android.build.dlext_testzip.mk
View file

@ -24,8 +24,6 @@ include $(CLEAR_VARS)
LOCAL_MODULE_CLASS := NATIVE_TESTS
LOCAL_MODULE := libdlext_test_zip_zipaligned
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_MODULE_SUFFIX := .zip
LOCAL_MODULE_PATH := $($(bionic_2nd_arch_prefix)TARGET_OUT_DATA_NATIVE_TESTS)/bionic-loader-test-libs/libdlext_test_zip
LOCAL_2ND_ARCH_VAR_PREFIX := $(bionic_2nd_arch_prefix)
@ -51,8 +49,6 @@ include $(CLEAR_VARS)
LOCAL_MODULE_CLASS := NATIVE_TESTS
LOCAL_MODULE := libdlext_test_runpath_zip_zipaligned
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_MODULE_SUFFIX := .zip
LOCAL_MODULE_PATH := $($(bionic_2nd_arch_prefix)TARGET_OUT_DATA_NATIVE_TESTS)/bionic-loader-test-libs/libdlext_test_runpath_zip
LOCAL_2ND_ARCH_VAR_PREFIX := $(bionic_2nd_arch_prefix)
@ -98,3 +94,4 @@ $(LOCAL_BUILT_MODULE) : $(lib_d) $(lib_a) $(lib_b) $(lib_c) $(lib_x) $(lib_y) $(
$(hide) touch $(dir $@)/zipdir/empty_file.txt
$(hide) (cd $(dir $@)/zipdir && zip -qrD0 ../$(notdir $@).unaligned .)
$(hide) $(BIONIC_TESTS_ZIPALIGN) 4096 $@.unaligned $@

2
tests/make_fortify_compile_test.mk
View file

@ -9,8 +9,6 @@ LOCAL_CXX := $(LOCAL_PATH)/touch-obj-on-success \
LOCAL_CLANG := true
LOCAL_MODULE := bionic-compile-time-tests$(FORTIFY_LEVEL)-clang++
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_TIDY := false
LOCAL_CPPFLAGS := -Wall -Wno-error
LOCAL_CPPFLAGS += -fno-color-diagnostics -ferror-limit=10000 -Xclang -verify

13
tools/Android.bp
View file

@ -1,16 +1,3 @@
package {
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
// all of the 'license_kinds' from "bionic_license"
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
// SPDX-license-identifier-BSD
// SPDX-license-identifier-ISC
// SPDX-license-identifier-MIT
// legacy_unencumbered
default_applicable_licenses: ["bionic_license"],
}
subdirs = ["*"]
filegroup {

13
tools/versioner/Android.bp
View file

@ -1,16 +1,3 @@
package {
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
// all of the 'license_kinds' from "bionic_license"
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
// SPDX-license-identifier-BSD
// SPDX-license-identifier-ISC
// SPDX-license-identifier-MIT
// legacy_unencumbered
default_applicable_licenses: ["bionic_license"],
}
subdirs = [
"src",
]

9
tools/versioner/src/Android.bp
View file

@ -1,12 +1,3 @@
package {
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
// all of the 'license_kinds' from "bionic_license"
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
default_applicable_licenses: ["bionic_license"],
}
cc_binary_host {
name: "versioner",