Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/modules/Connectivity" am: f5b346ed1d am: c384c677ef

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1587901

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f5af6eb56b232f1b79ff48ca6824f2ec726f01a
This commit is contained in:
Bob Badour
2021-02-19 07:48:38 +00:00
committed by Automerger Merge Worker
22 changed files with 89 additions and 1 deletions

View File

@@ -14,6 +14,10 @@
// limitations under the License.
//
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
java_defaults {
name: "TetheringAndroidLibraryDefaults",
sdk_version: "module_current",

View File

@@ -14,6 +14,10 @@
// limitations under the License.
//
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
apex {
name: "com.android.tethering",
// TODO: make updatable again once this contains only updatable artifacts (in particular, this

View File

@@ -17,6 +17,10 @@
//
// struct definitions shared with JNI
//
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
cc_library_headers {
name: "bpf_tethering_headers",
vendor_available: false,

View File

@@ -13,6 +13,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
java_sdk_library {
name: "framework-tethering",
defaults: ["framework-module-defaults"],

View File

@@ -14,6 +14,10 @@
// limitations under the License.
//
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
filegroup {
name: "TetheringTestsJarJarRules",
srcs: ["jarjar-rules.txt"],

View File

@@ -13,6 +13,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
java_defaults {
name: "TetheringIntegrationTestsDefaults",
srcs: [

View File

@@ -12,6 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
android_test {
// This tests for functionality that is not required for devices that
// don't use Tethering mainline module.

View File

@@ -14,6 +14,10 @@
// limitations under the License.
//
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
java_defaults {
name: "TetheringPrivilegedTestsJniDefaults",
jni_libs: [

View File

@@ -15,6 +15,10 @@
//
// Tests in this folder are included both in unit tests and CTS.
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
java_library {
name: "TetheringCommonTests",
srcs: [

View File

@@ -12,6 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
java_test_host {
name: "CtsHostsideNetworkTests",
defaults: ["cts_defaults"],

View File

@@ -12,6 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
java_test_helper_library {
name: "CtsHostsideNetworkTestsAidl",
sdk_version: "current",

View File

@@ -14,6 +14,10 @@
// limitations under the License.
//
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
android_test_helper_app {
name: "CtsHostsideNetworkTestsApp",
defaults: ["cts_support_defaults"],

View File

@@ -14,6 +14,10 @@
// limitations under the License.
//
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
android_test_helper_app {
name: "CtsHostsideNetworkTestsApp2",
defaults: ["cts_support_defaults"],

View File

@@ -1,3 +1,7 @@
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
android_app_certificate {
name: "cts-net-app",
certificate: "cts-net-app",

View File

@@ -12,6 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
java_defaults {
name: "CtsNetTestCasesDefaults",
defaults: ["cts_defaults"],

View File

@@ -12,6 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
android_test {
name: "CtsNetApi23TestCases",
defaults: ["cts_defaults"],

View File

@@ -12,6 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
android_test {
name: "CtsNetTestAppForApi23",
defaults: ["cts_defaults"],

View File

@@ -12,6 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
cc_library_shared {
name: "libnativedns_jni",

View File

@@ -1,3 +1,7 @@
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
cc_defaults {
name: "dns_async_defaults",

View File

@@ -14,6 +14,10 @@
// Build the unit tests.
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
cc_test {
name: "CtsNativeNetTestCases",

View File

@@ -15,6 +15,10 @@
//
// Common utilities for cts net tests.
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
java_library {
name: "cts-net-utils",
srcs: ["java/**/*.java", "java/**/*.kt"],

View File

@@ -12,6 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
android_test {
name: "CtsTetheringTest",
defaults: ["cts_defaults"],