Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e5009e1 authored by Bob Badour's avatar Bob Badour Committed by Automerger Merge Worker
Browse files

Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/modules/NetworkStack" am: 2371d761 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I047ed7ee632c105765f6a74e05eb1c2cc34a95c6
parents b17382ff 2371d761

Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -41,6 +41,10 @@ 
//                                                         TestNetworkStack



// Common defaults to define SDK level

package {

    default_applicable_licenses: ["Android-Apache-2.0"],

}



java_defaults {

    name: "NetworkStackDevApiLevel",

    min_sdk_version: "29",

common/captiveportal/Android.bp

+5 −1
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ 
// limitations under the License.

//



package {

    default_applicable_licenses: ["Android-Apache-2.0"],

}



java_library {

    name: "captiveportal-lib",

    srcs: ["src/**/*.java"],

common/moduleutils/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,10 @@ 
// Shared utility sources to be used by multiple network modules

// TODO: remove all frameworks/base dependencies on packages/modules/NetworkStack and

// frameworks/base/packages/Tethering by moving these files to frameworks/libs/net.

package {

    default_applicable_licenses: ["Android-Apache-2.0"],

}



filegroup {

    name: "net-module-utils-srcs",

    srcs: [

common/netlinkclient/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ 
// limitations under the License.

//



package {

    default_applicable_licenses: ["Android-Apache-2.0"],

}



java_library {

    name: "netlink-client",

    srcs: [

common/networkstackclient/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ 
//



// AIDL interfaces between the core system and the networking mainline module.

package {

    default_applicable_licenses: ["Android-Apache-2.0"],

}



aidl_interface {

    name: "ipmemorystore-aidl-interfaces",

    local_include_dir: "src",