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

Commit 073c6fa9 authored by Yan Yan's avatar Yan Yan Committed by Gerrit Code Review
Browse files

Merge changes from topic "ike-bcp" 

* changes:
  Ignore "android.net.ipsec.ike" <uses-library> tag
  Add IKE stub to main Android SDK
parents ad688d3e e4fc06b9

Android.bp

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

        ":framework-statsd-sources",

        ":framework-tethering-srcs",

        ":framework-tethering-srcs",

        ":framework-wifi-updatable-sources",

        ":framework-wifi-updatable-sources",

        ":ike-srcs",

        ":updatable-media-srcs",

        ":updatable-media-srcs",

    ],

    ],

    visibility: ["//visibility:private"],

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

java_library {

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

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

    static_libs: [

    static_libs: [

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

        "framework-media.stubs.module_lib",

        "framework-media.stubs.module_lib",

        "framework-mediaprovider.stubs.module_lib",

        "framework-mediaprovider.stubs.module_lib",

        "framework-permission.stubs.module_lib",

        "framework-permission.stubs.module_lib",
@@ -387,6 +389,7 @@ java_library { 
    name: "framework-all",

    name: "framework-all",

    installable: false,

    installable: false,

    static_libs: [

    static_libs: [

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

        "framework-minus-apex",

        "framework-minus-apex",

        "framework-mediaprovider.impl",

        "framework-mediaprovider.impl",

        "framework-permission.impl",

        "framework-permission.impl",

StubLibraries.bp

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

    name: "android_stubs_current",

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

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

    static_libs: [

    static_libs: [

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

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

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

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

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

        "framework-media.stubs",

        "framework-media.stubs",
@@ -322,6 +323,7 @@ java_library_static { 
    name: "android_system_stubs_current",

    name: "android_system_stubs_current",

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

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

    static_libs: [

    static_libs: [

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

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

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

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

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

        "framework-media.stubs.system",

        "framework-media.stubs.system",
@@ -357,6 +359,7 @@ java_library_static { 
    static_libs: [

    static_libs: [

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

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

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

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

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

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

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

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

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

        "framework-media.stubs.system",

        "framework-media.stubs.system",

api/Android.bp

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

genrule {

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

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

    srcs: [

    srcs: [

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

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

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

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

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

        ":framework-media{.public.api.txt}",

        ":framework-media{.public.api.txt}",
@@ -61,6 +62,7 @@ genrule { 
genrule {

genrule {

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

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

    srcs: [

    srcs: [

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

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

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

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

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

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

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

genrule {

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

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

    srcs: [

    srcs: [

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

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

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

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

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

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

        ":framework-media{.public.removed-api.txt}",
@@ -114,6 +117,7 @@ genrule { 
genrule {

genrule {

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

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

    srcs: [

    srcs: [

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

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

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

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

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

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

        ":framework-permission{.system.api.txt}",
@@ -144,6 +148,7 @@ genrule { 
genrule {

genrule {

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

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

    srcs: [

    srcs: [

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

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

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

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

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

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

        ":framework-permission{.system.removed-api.txt}",
@@ -174,6 +179,7 @@ genrule { 
genrule {

genrule {

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

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

    srcs: [

    srcs: [

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

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

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

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

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

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

        ":framework-permission{.module-lib.api.txt}",
@@ -203,6 +209,7 @@ genrule { 
genrule {

genrule {

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

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

    srcs: [

    srcs: [

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

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

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

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

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

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

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

services/core/Android.bp

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

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

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

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

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

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

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

        "app-compat-annotations",

        "app-compat-annotations",

        "framework-tethering.stubs.module_lib",

        "framework-tethering.stubs.module_lib",

        "service-permission.stubs.system_server",

        "service-permission.stubs.system_server",

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

0 → 100644
+35 −0
Original line number Original line 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);

    }

}