Revert "[LSC] Add LOCAL_LICENSE_KINDS to system/extras"

This reverts commit 044d055c842a5750359ed71dfe50a6a4bf5f4cc3.

Reason for revert: Needs to run as multiple roots.

Change-Id: I8e06e7eb19e0f634f52fbd8a1c6662f43e347dd5

24 files changed, 1 insertions, 222 deletions

diff --git a/tests/Android.bp b/tests/Android.bp
deleted file mode 100644
index af3b8b2f..00000000
--- a/tests/Android.bp
+++ /dev/null
@@ -1,31 +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: ["system_extras_tests_license"],
-}
-
-// Added automatically by a large-scale-change
-// See: http://go/android-license-faq
-license {
-    name: "system_extras_tests_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-    ],
-    license_text: [
-        "NOTICE",
-    ],
-}
diff --git a/tests/audio/alsa/Android.bp b/tests/audio/alsa/Android.bp
index 87c66452..60dbe87e 100644
--- a/tests/audio/alsa/Android.bp
+++ b/tests/audio/alsa/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 "system_extras_tests_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["system_extras_tests_license"],
-}
-
 cc_test {
     name: "pcmtest",
     srcs: ["pcmtest.cpp"],
diff --git a/tests/binder/benchmarks/Android.bp b/tests/binder/benchmarks/Android.bp
index 6a550688..5ac0895a 100644
--- a/tests/binder/benchmarks/Android.bp
+++ b/tests/binder/benchmarks/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 "system_extras_tests_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["system_extras_tests_license"],
-}
-
 cc_benchmark {
     name: "binderAddInts",
 
diff --git a/tests/bootloader/Android.mk b/tests/bootloader/Android.mk
index a5421a50..ab311fdc 100644
--- a/tests/bootloader/Android.mk
+++ b/tests/bootloader/Android.mk
@@ -6,9 +6,6 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := bootloader_unit_test
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE
 LOCAL_MODULE_TAGS := tests
 
 bootloader_py_files := $(call find-subdir-files, *.py)
diff --git a/tests/cpueater/Android.bp b/tests/cpueater/Android.bp
index 72c0e49b..315a18b0 100644
--- a/tests/cpueater/Android.bp
+++ b/tests/cpueater/Android.bp
@@ -13,23 +13,6 @@
 // limitations under the License.
 // Copyright The Android Open Source Project
 
-package {
-    default_applicable_licenses: ["system_extras_tests_cpueater_license"],
-}
-
-// Added automatically by a large-scale-change
-// See: http://go/android-license-faq
-license {
-    name: "system_extras_tests_cpueater_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-    ],
-    license_text: [
-        "NOTICE",
-    ],
-}
-
 cc_binary {
     name: "cpueater",
     srcs: ["cpueater.c"],
diff --git a/tests/crypto/Android.bp b/tests/crypto/Android.bp
index d0326d47..61cb8299 100644
--- a/tests/crypto/Android.bp
+++ b/tests/crypto/Android.bp
@@ -1,14 +1,5 @@
 // Copyright 2013 The Android Open Source Project
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "system_extras_tests_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["system_extras_tests_license"],
-}
-
 cc_binary {
     name: "get_dm_versions",
     srcs: ["get_dm_versions.c"],
diff --git a/tests/directiotest/Android.bp b/tests/directiotest/Android.bp
index ab2545ce..489e3c82 100644
--- a/tests/directiotest/Android.bp
+++ b/tests/directiotest/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 "system_extras_tests_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["system_extras_tests_license"],
-}
-
 cc_binary {
     name: "directiotest",
     srcs: ["directiotest.c"],
diff --git a/tests/ext4/Android.mk b/tests/ext4/Android.mk
index 0a384842..a9a684d2 100644
--- a/tests/ext4/Android.mk
+++ b/tests/ext4/Android.mk
@@ -7,9 +7,6 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES:= rand_emmc_perf.c
 LOCAL_CFLAGS := -Wall -Werror
 LOCAL_MODULE:= rand_emmc_perf
-LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS:= notice
-LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/../NOTICE
 LOCAL_MULTILIB := both
 LOCAL_MODULE_STEM_32:= rand_emmc_perf
 LOCAL_MODULE_STEM_64:= rand_emmc_perf64
@@ -19,3 +16,4 @@ LOCAL_FORCE_STATIC_EXECUTABLE := true
 LOCAL_STATIC_LIBRARIES := libm libc
 
 include $(BUILD_EXECUTABLE)
+
diff --git a/tests/framebuffer/Android.bp b/tests/framebuffer/Android.bp
index eda69dec..f072a59a 100644
--- a/tests/framebuffer/Android.bp
+++ b/tests/framebuffer/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 "system_extras_tests_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["system_extras_tests_license"],
-}
-
 cc_binary {
     name: "test-fb-refresh",
     srcs: ["refresh.c"],
diff --git a/tests/fstest/Android.bp b/tests/fstest/Android.bp
index 8c9ce68e..febbb2f7 100644
--- a/tests/fstest/Android.bp
+++ b/tests/fstest/Android.bp
@@ -12,15 +12,6 @@
 // See the License for the specific language governing permissions and
 // 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 "system_extras_tests_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["system_extras_tests_license"],
-}
-
 cc_test {
     name: "recovery_test",
     srcs: ["recovery_test.cpp"],
diff --git a/tests/icachetest/Android.bp b/tests/icachetest/Android.bp
index 4e9d0d05..e8c72855 100644
--- a/tests/icachetest/Android.bp
+++ b/tests/icachetest/Android.bp
@@ -1,14 +1,5 @@
 // Copyright 2006 The Android Open Source Project
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "system_extras_tests_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["system_extras_tests_license"],
-}
-
 cc_binary {
     name: "icache",
 
diff --git a/tests/iptables/qtaguid/Android.bp b/tests/iptables/qtaguid/Android.bp
index 935c0b41..9c853c8b 100644
--- a/tests/iptables/qtaguid/Android.bp
+++ b/tests/iptables/qtaguid/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 "system_extras_tests_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["system_extras_tests_license"],
-}
-
 cc_test {
     name: "socketTag",
     srcs: ["socketTag.cpp"],
diff --git a/tests/kernel.config/Android.mk b/tests/kernel.config/Android.mk
index cff19bac..a622bf56 100644
--- a/tests/kernel.config/Android.mk
+++ b/tests/kernel.config/Android.mk
@@ -31,9 +31,6 @@ test_src_files := \
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := kernel-config-unit-tests
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE
 LOCAL_MODULE_TAGS := tests
 LOCAL_CFLAGS := $(test_c_flags)
 LOCAL_CFLAGS += -DHAS_KCMP
@@ -43,9 +40,6 @@ include $(BUILD_NATIVE_TEST)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := CtsKernelConfigTestCases
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS := $(test_c_flags)
 LOCAL_CFLAGS += -DHAS_KCMP
@@ -66,8 +60,5 @@ LOCAL_SRC_FILES := \
     scrape_mmap_addr.cpp
 
 LOCAL_MODULE := scrape_mmap_addr
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE
 LOCAL_CFLAGS := -Wall -Werror
 include $(BUILD_NATIVE_TEST)
diff --git a/tests/lib/Android.bp b/tests/lib/Android.bp
index f41419e3..b44c2960 100644
--- a/tests/lib/Android.bp
+++ b/tests/lib/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 "system_extras_tests_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["system_extras_tests_license"],
-}
-
 subdirs = ["*"]
diff --git a/tests/lib/testUtil/Android.bp b/tests/lib/testUtil/Android.bp
index 39fad294..a5a3f517 100644
--- a/tests/lib/testUtil/Android.bp
+++ b/tests/lib/testUtil/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 "system_extras_tests_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["system_extras_tests_license"],
-}
-
 cc_library_static {
     name: "libtestUtil",
     srcs: ["testUtil.c"],
diff --git a/tests/memeater/Android.mk b/tests/memeater/Android.mk
index e22da649..a07564ab 100644
--- a/tests/memeater/Android.mk
+++ b/tests/memeater/Android.mk
@@ -17,9 +17,6 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := memeater
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
 LOCAL_SRC_FILES := memeater.c
 LOCAL_CFLAGS := -Wall -Werror -Wno-unused-parameter
diff --git a/tests/pagingtest/Android.mk b/tests/pagingtest/Android.mk
index 69fea9d0..de952ce3 100644
--- a/tests/pagingtest/Android.mk
+++ b/tests/pagingtest/Android.mk
@@ -9,9 +9,6 @@ LOCAL_SRC_FILES:=    \
     thrashing_test.c
 
 LOCAL_MODULE:= pagingtest
-LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS:= notice
-LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/../NOTICE
 
 LOCAL_CFLAGS := -Wall -Werror
 
diff --git a/tests/pftest/Android.bp b/tests/pftest/Android.bp
index 2a9ef6ba..dcd8b5b9 100644
--- a/tests/pftest/Android.bp
+++ b/tests/pftest/Android.bp
@@ -1,14 +1,5 @@
 // Copyright 2010 The Android Open Source Project
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "system_extras_tests_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["system_extras_tests_license"],
-}
-
 cc_binary {
     name: "pftest",
 
diff --git a/tests/schedtest/Android.bp b/tests/schedtest/Android.bp
index ac10b117..28ece031 100644
--- a/tests/schedtest/Android.bp
+++ b/tests/schedtest/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 "system_extras_tests_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["system_extras_tests_license"],
-}
-
 cc_binary {
     name: "schedtest",
     srcs: ["schedtest.c"],
diff --git a/tests/storage/Android.bp b/tests/storage/Android.bp
index 9bbd24ea..ba9bf1fe 100644
--- a/tests/storage/Android.bp
+++ b/tests/storage/Android.bp
@@ -1,14 +1,5 @@
 // Copyright 2013 The Android Open Source Project
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "system_extras_tests_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["system_extras_tests_license"],
-}
-
 cc_binary {
     name: "opentest",
     srcs: ["opentest.c"],
diff --git a/tests/suspend_stress/Android.bp b/tests/suspend_stress/Android.bp
index bceff117..e7a0d94c 100644
--- a/tests/suspend_stress/Android.bp
+++ b/tests/suspend_stress/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 "system_extras_tests_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["system_extras_tests_license"],
-}
-
 cc_binary {
     name: "suspend_stress",
     srcs: ["suspend_stress.cpp"],
diff --git a/tests/tcp_nuke_addr/Android.bp b/tests/tcp_nuke_addr/Android.bp
index 1a504395..316fd3a1 100644
--- a/tests/tcp_nuke_addr/Android.bp
+++ b/tests/tcp_nuke_addr/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 "system_extras_tests_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["system_extras_tests_license"],
-}
-
 cc_test {
     name: "tcp_nuke_addr_test",
     srcs: ["tcp_nuke_addr_test.cpp"],
diff --git a/tests/timetest/Android.bp b/tests/timetest/Android.bp
index c4f361cb..481610b7 100644
--- a/tests/timetest/Android.bp
+++ b/tests/timetest/Android.bp
@@ -1,14 +1,5 @@
 // Copyright 2006 The Android Open Source Project
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "system_extras_tests_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["system_extras_tests_license"],
-}
-
 cc_test {
     name: "time-unit-tests",
     cflags: [
diff --git a/tests/uevents/Android.bp b/tests/uevents/Android.bp
index 4548b456..a292ebcf 100644
--- a/tests/uevents/Android.bp
+++ b/tests/uevents/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 "system_extras_tests_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["system_extras_tests_license"],
-}
-
 cc_binary {
     name: "uevents",
     srcs: ["uevents.c"],