Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Compile NetworkStack resources only once" am: 963136ce56

Browse Source 
am: 4aea56297c

Change-Id: I3b24d5f07c2b72a761431c836fcc6ff841316043
This commit is contained in:
Remi NGUYEN VAN
2019-03-25 00:58:04 -07:00
committed by android-build-merger
parent 11f4cbcbd7 4aea56297c
commit b4c9d697f5
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
packages/NetworkStack/Android.bp
View File

@@ -14,11 +14,16 @@
// limitations under the License. // limitations under the License.
// //
java_defaults {
name: "NetworkStackCommon",
sdk_version: "system_current",
min_sdk_version: "28",
}
// Library including the network stack, used to compile both variants of the network stack // Library including the network stack, used to compile both variants of the network stack
android_library { android_library {
name: "NetworkStackBase", name: "NetworkStackBase",
sdk_version: "system_current", defaults: ["NetworkStackCommon"],
min_sdk_version: "28",
srcs: [ srcs: [
"src/**/*.java", "src/**/*.java",
":framework-networkstack-shared-srcs", ":framework-networkstack-shared-srcs",
@@ -34,34 +39,32 @@ android_library {
manifest: "AndroidManifestBase.xml", manifest: "AndroidManifestBase.xml",
} }
// Non-updatable in-process network stack for devices not using the module java_defaults {
android_app { name: "NetworkStackAppCommon",
name: "InProcessNetworkStack", defaults: ["NetworkStackCommon"],
sdk_version: "system_current",
min_sdk_version: "28",
certificate: "platform",
privileged: true, privileged: true,
static_libs: [ static_libs: [
"NetworkStackBase", "NetworkStackBase",
], ],
// Resources already included in NetworkStackBase
resource_dirs: [],
jarjar_rules: "jarjar-rules-shared.txt", jarjar_rules: "jarjar-rules-shared.txt",
// The permission configuration *must* be included to ensure security of the device // The permission configuration *must* be included to ensure security of the device
required: ["NetworkStackPermissionStub"], required: ["NetworkStackPermissionStub"],
}
// Non-updatable network stack running in the system server process for devices not using the module
android_app {
name: "InProcessNetworkStack",
defaults: ["NetworkStackAppCommon"],
certificate: "platform",
manifest: "AndroidManifest_InProcess.xml", manifest: "AndroidManifest_InProcess.xml",
} }
// Updatable network stack packaged as an application // Updatable network stack packaged as an application
android_app { android_app {
name: "NetworkStack", name: "NetworkStack",
sdk_version: "system_current", defaults: ["NetworkStackAppCommon"],
min_sdk_version: "28",
certificate: "networkstack", certificate: "networkstack",
privileged: true,
static_libs: [
"NetworkStackBase"
],
jarjar_rules: "jarjar-rules-shared.txt",
// The permission configuration *must* be included to ensure security of the device
required: ["NetworkStackPermissionStub"],
manifest: "AndroidManifest.xml", manifest: "AndroidManifest.xml",
} }