Rename NetworkStackPermissionStub
Use NetworkStackPermissionConfig instead. Also remove the source directory: soong now manages to build the package without it. Bug: 129317412 Test: Flashed, booted, WiFi working (clean cherry-pick of aosp I45299c12598cd3b33bfd78ae8698d98b77b18dc0) Change-Id: I7bdc058dddfa483823074055ad5c9d7d2efd37b9
This commit is contained in:
@@ -16,7 +16,7 @@
|
||||
|
||||
// Stub APK to define permissions for NetworkStack
|
||||
android_app {
|
||||
name: "NetworkStackPermissionStub",
|
||||
name: "NetworkPermissionConfig",
|
||||
// TODO: mark app as hasCode=false in manifest once soong stops complaining about apps without
|
||||
// a classes.dex.
|
||||
srcs: ["src/**/*.java"],
|
||||
@@ -17,7 +17,7 @@
|
||||
*/
|
||||
-->
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.android.networkstack.permissionstub"
|
||||
package="com.android.networkstack.permissionconfig"
|
||||
android:sharedUserId="android.uid.networkstack"
|
||||
android:versionCode="11"
|
||||
android:versionName="Q-initial">
|
||||
@@ -36,5 +36,5 @@
|
||||
<permission android:name="android.permission.MAINLINE_NETWORK_STACK"
|
||||
android:protectionLevel="signature"/>
|
||||
|
||||
<application android:name="com.android.server.NetworkStackPermissionStub"/>
|
||||
<application android:name="com.android.server.NetworkPermissionConfig"/>
|
||||
</manifest>
|
||||
@@ -19,8 +19,8 @@ package com.android.server;
|
||||
import android.app.Application;
|
||||
|
||||
/**
|
||||
* Empty application for NetworkStackStub that only exists because soong builds complain if APKs
|
||||
* have no source file.
|
||||
* Empty application for NetworkPermissionConfig that only exists because
|
||||
* soong builds complain if APKs have no source file.
|
||||
*/
|
||||
public class NetworkStackPermissionStub extends Application {
|
||||
public class NetworkPermissionConfig extends Application {
|
||||
}
|
||||
@@ -50,7 +50,7 @@ java_defaults {
|
||||
resource_dirs: [],
|
||||
jarjar_rules: "jarjar-rules-shared.txt",
|
||||
// The permission configuration *must* be included to ensure security of the device
|
||||
required: ["NetworkStackPermissionStub"],
|
||||
required: ["NetworkPermissionConfig"],
|
||||
}
|
||||
|
||||
// Non-updatable network stack running in the system server process for devices not using the module
|
||||
|
||||
Reference in New Issue
Block a user