Merge "Expose TEST_TAP_PREFIX as system API" am: a23086c536 am: 37a204c54b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579503
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I326fc7a3731c45cde898aeb641cdf065c58ff5db
diff --git a/framework/Android.bp b/framework/Android.bp
index 3326ea9..8db8d76 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -15,15 +15,6 @@
//
// TODO: use a java_library in the bootclasspath instead
-package {
- // See: http://go/android-license-faq
- // A large-scale-change added 'default_applicable_licenses' to import
- // all of the 'license_kinds' from "frameworks_base_license"
- // to get the below license kinds:
- // SPDX-license-identifier-Apache-2.0
- default_applicable_licenses: ["frameworks_base_license"],
-}
-
filegroup {
name: "framework-connectivity-sources",
srcs: [
@@ -35,4 +26,4 @@
"//frameworks/base",
"//packages/modules/Connectivity:__subpackages__",
],
-}
+}
\ No newline at end of file
diff --git a/service/Android.bp b/service/Android.bp
index f20b89f..ed1716f 100644
--- a/service/Android.bp
+++ b/service/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 "frameworks_base_license"
- // to get the below license kinds:
- // SPDX-license-identifier-Apache-2.0
- default_applicable_licenses: ["frameworks_base_license"],
-}
-
cc_library_shared {
name: "libservice-connectivity",
// TODO: build against the NDK (sdk_version: "30" for example)
diff --git a/tests/net/Android.bp b/tests/net/Android.bp
index 8122495..ffde68e 100644
--- a/tests/net/Android.bp
+++ b/tests/net/Android.bp
@@ -1,15 +1,6 @@
//########################################################################
// Build FrameworksNetTests package
//########################################################################
-package {
- // See: http://go/android-license-faq
- // A large-scale-change added 'default_applicable_licenses' to import
- // all of the 'license_kinds' from "frameworks_base_license"
- // to get the below license kinds:
- // SPDX-license-identifier-Apache-2.0
- default_applicable_licenses: ["frameworks_base_license"],
-}
-
java_defaults {
name: "FrameworksNetTests-jni-defaults",
jni_libs: [
diff --git a/tests/net/common/Android.bp b/tests/net/common/Android.bp
index babb81c..c271f49 100644
--- a/tests/net/common/Android.bp
+++ b/tests/net/common/Android.bp
@@ -16,15 +16,6 @@
// Tests in this folder are included both in unit tests and CTS.
// They must be fast and stable, and exercise public or test APIs.
-package {
- // See: http://go/android-license-faq
- // A large-scale-change added 'default_applicable_licenses' to import
- // all of the 'license_kinds' from "frameworks_base_license"
- // to get the below license kinds:
- // SPDX-license-identifier-Apache-2.0
- default_applicable_licenses: ["frameworks_base_license"],
-}
-
java_library {
name: "FrameworksNetCommonTests",
srcs: ["java/**/*.java", "java/**/*.kt"],
diff --git a/tests/net/smoketest/Android.bp b/tests/net/smoketest/Android.bp
index 1535f3d..84ae2b5 100644
--- a/tests/net/smoketest/Android.bp
+++ b/tests/net/smoketest/Android.bp
@@ -9,15 +9,6 @@
//
// TODO: remove this hack when there is a better solution for jni_libs that includes
// dependent libraries.
-package {
- // See: http://go/android-license-faq
- // A large-scale-change added 'default_applicable_licenses' to import
- // all of the 'license_kinds' from "frameworks_base_license"
- // to get the below license kinds:
- // SPDX-license-identifier-Apache-2.0
- default_applicable_licenses: ["frameworks_base_license"],
-}
-
android_test {
name: "FrameworksNetSmokeTests",
defaults: ["FrameworksNetTests-jni-defaults"],
@@ -28,4 +19,4 @@
"mockito-target-minus-junit4",
"services.core",
],
-}
+}
\ No newline at end of file