Merge "Set updatable=false explicitly."
diff --git a/Android.bp b/Android.bp
deleted file mode 100644
index c2caebe..0000000
--- a/Android.bp
+++ /dev/null
@@ -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
-}
diff --git a/apex/Android.bp b/apex/Android.bp
index 19894f1..e0a8753 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -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",
diff --git a/benchmarks/Android.bp b/benchmarks/Android.bp
index fa31e7e..61084a1 100644
--- a/benchmarks/Android.bp
+++ b/benchmarks/Android.bp
@@ -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: [
diff --git a/benchmarks/linker_relocation/Android.bp b/benchmarks/linker_relocation/Android.bp
index 993ece2..f8ef9e0 100644
--- a/benchmarks/linker_relocation/Android.bp
+++ b/benchmarks/linker_relocation/Android.bp
@@ -24,19 +24,11 @@
// 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"],
export_include_dirs: ["include"],
+ bazel_module: { bp2build_available: true },
}
// TODO: This benchmark doesn't work with TradeFed/atest because it doesn't copy its test libraries
diff --git a/benchmarks/linker_relocation/gen/Android.bp b/benchmarks/linker_relocation/gen/Android.bp
index 7b5fafc..e535e53 100644
--- a/benchmarks/linker_relocation/gen/Android.bp
+++ b/benchmarks/linker_relocation/gen/Android.bp
@@ -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: [
diff --git a/benchmarks/spawn/Android.bp b/benchmarks/spawn/Android.bp
index 8235e38..689e7c9 100644
--- a/benchmarks/spawn/Android.bp
+++ b/benchmarks/spawn/Android.bp
@@ -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,
diff --git a/libc/Android.bp b/libc/Android.bp
index 828484d..6a3a7c0 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -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",
@@ -1857,6 +1823,7 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
+ bazel_module: { bp2build_available: true },
}
cc_library_headers {
@@ -1914,6 +1881,7 @@
export_system_include_dirs: ["kernel/uapi/asm-x86"],
},
},
+ bazel_module: { bp2build_available: true },
}
cc_library_headers {
@@ -1963,7 +1931,8 @@
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
- }
+ },
+ bazel_module: { bp2build_available: true },
}
// ========================================================
diff --git a/libc/async_safe/Android.bp b/libc/async_safe/Android.bp
index a6111b7..222d9f6 100644
--- a/libc/async_safe/Android.bp
+++ b/libc/async_safe/Android.bp
@@ -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: [
@@ -56,4 +47,5 @@
"//apex_available:platform",
"com.android.runtime",
],
+ bazel_module: { bp2build_available: true },
}
diff --git a/libc/include/android/legacy_signal_inlines.h b/libc/include/android/legacy_signal_inlines.h
index e968c45..95c2320 100644
--- a/libc/include/android/legacy_signal_inlines.h
+++ b/libc/include/android/legacy_signal_inlines.h
@@ -50,7 +50,7 @@
* can't use __builtin_available, but the platform builds with -Werror=unguarded-availability so
* it requires __builtin_available.
*/
-#if defined(__ANDROID_UNGUARDED_AVAILABILITY__)
+#if defined(__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__)
if (__builtin_available(android 21, *)) {
#else
if (__libc_current_sigrtmax) {
@@ -66,7 +66,7 @@
* can't use __builtin_available, but the platform builds with -Werror=unguarded-availability so
* it requires __builtin_available.
*/
-#if defined(__ANDROID_UNGUARDED_AVAILABILITY__)
+#if defined(__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__)
if (__builtin_available(android 21, *)) {
#else
if (__libc_current_sigrtmin) {
diff --git a/libc/include/android/versioning.h b/libc/include/android/versioning.h
index 54ffc91..214acf2 100644
--- a/libc/include/android/versioning.h
+++ b/libc/include/android/versioning.h
@@ -49,22 +49,19 @@
// allows libc++ to refer to these functions in inlines without needing to guard them, needed since
// libc++ doesn't currently guard these calls. There's no risk to the apps though because using
// those APIs will still cause a link error.
-#if defined(__ANDROID_UNGUARDED_AVAILABILITY__)
-#define __MAYBE_STRICT
+#if defined(__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__)
+#define __BIONIC_AVAILABILITY(__what) __attribute__((__availability__(android,__what)))
#define __INTRODUCED_IN_NO_GUARD_FOR_NDK(api_level) __INTRODUCED_IN_X86(api_level)
#define __INTRODUCED_IN_X86_NO_GUARD_FOR_NDK(api_level) __INTRODUCED_IN_X86(api_level)
#else
-#define __MAYBE_STRICT ,strict
+#define __BIONIC_AVAILABILITY(__what) __attribute__((__availability__(android,strict,__what)))
#define __INTRODUCED_IN_NO_GUARD_FOR_NDK(api_level)
#define __INTRODUCED_IN_X86_NO_GUARD_FOR_NDK(api_level)
#endif
-#define __INTRODUCED_IN(api_level) \
- __attribute__((availability(android __MAYBE_STRICT,introduced=api_level)))
-#define __DEPRECATED_IN(api_level) \
- __attribute__((availability(android __MAYBE_STRICT,deprecated=api_level)))
-#define __REMOVED_IN(api_level) \
- __attribute__((availability(android __MAYBE_STRICT,obsoleted=api_level)))
+#define __INTRODUCED_IN(api_level) __BIONIC_AVAILABILITY(introduced=api_level)
+#define __DEPRECATED_IN(api_level) __BIONIC_AVAILABILITY(deprecated=api_level)
+#define __REMOVED_IN(api_level) __BIONIC_AVAILABILITY(obsoleted=api_level)
// The same availability attribute can't be annotated multiple times. Therefore, the macros are
// defined for the configuration that it is valid for so that declarations like the below doesn't
@@ -79,23 +76,19 @@
//
// hasn't been supported and won't be.
#if !defined(__LP64__)
-#define __INTRODUCED_IN_32(api_level) \
- __attribute__((availability(android __MAYBE_STRICT,introduced=api_level)))
+#define __INTRODUCED_IN_32(api_level) __BIONIC_AVAILABILITY(introduced=api_level)
#define __INTRODUCED_IN_64(api_level)
#else
#define __INTRODUCED_IN_32(api_level)
-#define __INTRODUCED_IN_64(api_level) \
- __attribute__((availability(android __MAYBE_STRICT,introduced=api_level)))
+#define __INTRODUCED_IN_64(api_level) __BIONIC_AVAILABILITY(introduced=api_level)
#endif
#if defined(__arm__) || defined(__aarch64__)
-#define __INTRODUCED_IN_ARM(api_level) \
- __attribute__((availability(android __MAYBE_STRICT,introduced=api_level)))
+#define __INTRODUCED_IN_ARM(api_level) __BIONIC_AVAILABILITY(introduced=api_level)
#define __INTRODUCED_IN_X86(api_level)
#elif defined(__i386__) || defined(__x86_64__)
#define __INTRODUCED_IN_ARM(api_level)
-#define __INTRODUCED_IN_X86(api_level) \
- __attribute__((availability(android __MAYBE_STRICT,introduced=api_level)))
+#define __INTRODUCED_IN_X86(api_level) __BIONIC_AVAILABILITY(introduced=api_level)
#else
#define __INTRODUCED_IN_ARM(api_level)
#define __INTRODUCED_IN_X86(api_level)
diff --git a/libc/malloc_debug/Android.bp b/libc/malloc_debug/Android.bp
index 3b3a22e..760039b 100644
--- a/libc/malloc_debug/Android.bp
+++ b/libc/malloc_debug/Android.bp
@@ -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,
diff --git a/libc/malloc_hooks/Android.bp b/libc/malloc_hooks/Android.bp
index 01394da..487f3fb 100644
--- a/libc/malloc_hooks/Android.bp
+++ b/libc/malloc_hooks/Android.bp
@@ -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",
diff --git a/libc/system_properties/Android.bp b/libc/system_properties/Android.bp
index 361fc79..3846169 100644
--- a/libc/system_properties/Android.bp
+++ b/libc/system_properties/Android.bp
@@ -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"],
diff --git a/libc/tools/Android.bp b/libc/tools/Android.bp
index 0b0b240..bf515ca 100644
--- a/libc/tools/Android.bp
+++ b/libc/tools/Android.bp
@@ -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"]
diff --git a/libdl/Android.bp b/libdl/Android.bp
index e98704a..5c9fc9c 100644
--- a/libdl/Android.bp
+++ b/libdl/Android.bp
@@ -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"],
diff --git a/libfdtrack/Android.bp b/libfdtrack/Android.bp
index e45cf2b..a907d9a 100644
--- a/libfdtrack/Android.bp
+++ b/libfdtrack/Android.bp
@@ -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"],
diff --git a/libm/Android.bp b/libm/Android.bp
index ccdce01..723d126 100644
--- a/libm/Android.bp
+++ b/libm/Android.bp
@@ -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"],
diff --git a/linker/Android.bp b/linker/Android.bp
index c8270a4..06e6fbc 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -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,
diff --git a/linker/ldd b/linker/ldd
old mode 100644
new mode 100755
diff --git a/tests/Android.bp b/tests/Android.bp
index 50ee21c..5840018 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -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,
diff --git a/tests/headers/Android.bp b/tests/headers/Android.bp
index baa901c..b44c296 100644
--- a/tests/headers/Android.bp
+++ b/tests/headers/Android.bp
@@ -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 = ["*"]
diff --git a/tests/headers/posix/Android.bp b/tests/headers/posix/Android.bp
index 6ed6553..8f3a2f2 100644
--- a/tests/headers/posix/Android.bp
+++ b/tests/headers/posix/Android.bp
@@ -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"],
diff --git a/tests/libs/Android.bp b/tests/libs/Android.bp
index 59ddc48..ba1c198 100644
--- a/tests/libs/Android.bp
+++ b/tests/libs/Android.bp
@@ -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,
diff --git a/tests/libs/Android.build.dlext_testzip.mk b/tests/libs/Android.build.dlext_testzip.mk
index dba2a09..8775c29 100644
--- a/tests/libs/Android.build.dlext_testzip.mk
+++ b/tests/libs/Android.build.dlext_testzip.mk
@@ -24,8 +24,6 @@
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 @@
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 @@
$(hide) touch $(dir $@)/zipdir/empty_file.txt
$(hide) (cd $(dir $@)/zipdir && zip -qrD0 ../$(notdir $@).unaligned .)
$(hide) $(BIONIC_TESTS_ZIPALIGN) 4096 $@.unaligned $@
+
diff --git a/tests/make_fortify_compile_test.mk b/tests/make_fortify_compile_test.mk
index 5357c9e..c36dfdd 100644
--- a/tests/make_fortify_compile_test.mk
+++ b/tests/make_fortify_compile_test.mk
@@ -9,8 +9,6 @@
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
diff --git a/tools/Android.bp b/tools/Android.bp
index 4b9e320..dfeea19 100644
--- a/tools/Android.bp
+++ b/tools/Android.bp
@@ -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 {
diff --git a/tools/versioner/Android.bp b/tools/versioner/Android.bp
index 778dbce..061709a 100644
--- a/tools/versioner/Android.bp
+++ b/tools/versioner/Android.bp
@@ -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",
]
diff --git a/tools/versioner/src/Android.bp b/tools/versioner/src/Android.bp
index cc45c4a..a78ab5d 100644
--- a/tools/versioner/src/Android.bp
+++ b/tools/versioner/src/Android.bp
@@ -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",