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

Commit d390460e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "ike-bcp-sc-dev" into sc-dev am: 046870ae 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13499314

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie8b1dd9ca674015f11126535d58c3543dcd077a6
parents 20fe1f31 046870ae

Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -405,6 +405,7 @@ filegroup { 
        ":framework-statsd-sources",

        ":framework-tethering-srcs",

        ":framework-wifi-updatable-sources",

        ":ike-srcs",

        ":updatable-media-srcs",

    ],

    visibility: ["//visibility:private"],
@@ -413,6 +414,7 @@ filegroup { 
java_library {

    name: "framework-updatable-stubs-module_libs_api",

    static_libs: [

        "android.net.ipsec.ike.stubs.module_lib",

        "framework-appsearch.stubs.module_lib",

        "framework-graphics.stubs.module_lib",

        "framework-media.stubs.module_lib",
@@ -432,6 +434,7 @@ java_library { 
    name: "framework-all",

    installable: false,

    static_libs: [

        "android.net.ipsec.ike.impl",

        "framework-minus-apex",

        "framework-appsearch.impl",

        "framework-graphics.impl",

StubLibraries.bp

+3 −0
Original line number Diff line number Diff line
@@ -306,6 +306,7 @@ java_library_static { 
    name: "android_stubs_current",

    srcs: [ ":api-stubs-docs-non-updatable" ],

    static_libs: [

        "android.net.ipsec.ike.stubs",

        "art.module.public.api.stubs",

        "conscrypt.module.public.api.stubs",

        "framework-appsearch.stubs",
@@ -328,6 +329,7 @@ java_library_static { 
    name: "android_system_stubs_current",

    srcs: [ ":system-api-stubs-docs-non-updatable" ],

    static_libs: [

        "android.net.ipsec.ike.stubs.system",

        "art.module.public.api.stubs",

        "conscrypt.module.public.api.stubs",

        "framework-appsearch.stubs.system",
@@ -366,6 +368,7 @@ java_library_static { 
    static_libs: [

        // Modules do not have test APIs, but we want to include their SystemApis, like we include

        // the SystemApi of framework-non-updatable-sources.

        "android.net.ipsec.ike.stubs.system",

        "art.module.public.api.stubs",

        "conscrypt.module.public.api.stubs",

        "framework-appsearch.stubs.system",

api/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ genrule { 
genrule {

    name: "frameworks-base-api-current.txt",

    srcs: [

        ":android.net.ipsec.ike{.public.api.txt}",

        ":art.module.public.api{.public.api.txt}",

        ":conscrypt.module.public.api{.public.api.txt}",

        ":framework-appsearch{.public.api.txt}",
@@ -64,6 +65,7 @@ genrule { 
genrule {

    name: "frameworks-base-api-current.srcjar",

    srcs: [

        ":android.net.ipsec.ike{.public.stubs.source}",

        ":api-stubs-docs-non-updatable",

        ":art.module.public.api{.public.stubs.source}",

        ":conscrypt.module.public.api{.public.stubs.source}",
@@ -88,6 +90,7 @@ genrule { 
genrule {

    name: "frameworks-base-api-removed.txt",

    srcs: [

        ":android.net.ipsec.ike{.public.removed-api.txt}",

        ":art.module.public.api{.public.removed-api.txt}",

        ":conscrypt.module.public.api{.public.removed-api.txt}",

        ":framework-appsearch{.public.removed-api.txt}",
@@ -123,6 +126,7 @@ genrule { 
genrule {

    name: "frameworks-base-api-system-current.txt",

    srcs: [

        ":android.net.ipsec.ike{.system.api.txt}",

        ":framework-appsearch{.system.api.txt}",

        ":framework-graphics{.system.api.txt}",

        ":framework-media{.system.api.txt}",
@@ -156,6 +160,7 @@ genrule { 
genrule {

    name: "frameworks-base-api-system-removed.txt",

    srcs: [

        ":android.net.ipsec.ike{.system.removed-api.txt}",

        ":framework-appsearch{.system.removed-api.txt}",

        ":framework-graphics{.system.removed-api.txt}",

        ":framework-media{.system.removed-api.txt}",
@@ -189,6 +194,7 @@ genrule { 
genrule {

    name: "frameworks-base-api-module-lib-current.txt",

    srcs: [

        ":android.net.ipsec.ike{.module-lib.api.txt}",

        ":framework-appsearch{.module-lib.api.txt}",

        ":framework-graphics{.module-lib.api.txt}",

        ":framework-media{.module-lib.api.txt}",
@@ -221,6 +227,7 @@ genrule { 
genrule {

    name: "frameworks-base-api-module-lib-removed.txt",

    srcs: [

        ":android.net.ipsec.ike{.module-lib.removed-api.txt}",

        ":framework-appsearch{.module-lib.removed-api.txt}",

        ":framework-graphics{.module-lib.removed-api.txt}",

        ":framework-media{.module-lib.removed-api.txt}",

services/core/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ java_library_static { 
        "android.hardware.power-V1-java",

        "android.hardware.power-V1.0-java",

        "android.hardware.vibrator-V2-java",

        "android.net.ipsec.ike.stubs.module_lib",

        "app-compat-annotations",

        "framework-tethering.stubs.module_lib",

        "service-permission.stubs.system_server",

services/core/java/com/android/server/pm/parsing/library/AndroidNetIpSecIkeUpdater.java

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 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.

 */

package com.android.server.pm.parsing.library;



import com.android.internal.annotations.VisibleForTesting;

import com.android.server.pm.parsing.pkg.ParsedPackage;



/**

 * Updates a package to remove dependency on android.net.ipsec.ike library.

 *

 * @hide

 */

@VisibleForTesting

public class AndroidNetIpSecIkeUpdater extends PackageSharedLibraryUpdater {



    private static final String LIBRARY_NAME = "android.net.ipsec.ike";



    @Override

    public void updatePackage(ParsedPackage parsedPackage, boolean isUpdatedSystemApp) {

        removeLibrary(parsedPackage, LIBRARY_NAME);

    }

}