Add the connectivity service JAR to the tethering APEX. This change should not be released in monthly updates until the modularization work is done, so will be reverted in module release branches. This rolls forward the change. The original topic was reverted because of a bad merged-in clause; this is fixed and re-verified in this topic. Test: Boot, wifi connects and has internet access Bug: 171540887 Change-Id: Ib0ac49609e444a53a6fee4575f5078e15f364eef
57 lines
1.6 KiB
Plaintext
57 lines
1.6 KiB
Plaintext
//
|
|
// Copyright (C) 2019 The Android Open Source Project
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
//
|
|
|
|
apex {
|
|
name: "com.android.tethering",
|
|
// TODO: make updatable again once this contains only updatable artifacts (in particular, this
|
|
// cannot build as updatable unless service-connectivity builds against stable API).
|
|
// updatable: true,
|
|
// min_sdk_version: "30",
|
|
java_libs: [
|
|
"framework-tethering",
|
|
"service-connectivity",
|
|
],
|
|
jni_libs: [
|
|
"libservice-connectivity",
|
|
],
|
|
bpfs: ["offload.o"],
|
|
apps: ["Tethering"],
|
|
manifest: "manifest.json",
|
|
key: "com.android.tethering.key",
|
|
|
|
androidManifest: "AndroidManifest.xml",
|
|
}
|
|
|
|
apex_key {
|
|
name: "com.android.tethering.key",
|
|
public_key: "com.android.tethering.avbpubkey",
|
|
private_key: "com.android.tethering.pem",
|
|
}
|
|
|
|
android_app_certificate {
|
|
name: "com.android.tethering.certificate",
|
|
certificate: "com.android.tethering",
|
|
}
|
|
|
|
override_apex {
|
|
name: "com.android.tethering.inprocess",
|
|
base: "com.android.tethering",
|
|
package_name: "com.android.tethering.inprocess",
|
|
apps: [
|
|
"InProcessTethering",
|
|
],
|
|
}
|