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

Commit 5695f39e authored by Sandro Montanari's avatar Sandro Montanari Committed by Android (Google) Code Review
Browse files

Merge "Move NSC classes in platform to packages/NetworkSecurityConfig" into main

parents ddd8fa9a fe0816f8
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ filegroup {
        ":messagequeue-gen",
        ":ranging_stack_mock_initializer",
        ":systemfeatures-gen-srcs",
        ":framework-network-security-config-sources",
    ],
    // Exactly one MessageQueue.java will be added to srcs by messagequeue-gen
    exclude_srcs: [
+0 −4
Original line number Diff line number Diff line
# Bug component: 36824

brambonne@google.com
jeffv@google.com
+32 −0
Original line number Diff line number Diff line
// Copyright (C) 2025 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 {
    default_applicable_licenses: ["Android-Apache-2.0"],
}

filegroup {
    name: "framework-network-security-config-sources",
    srcs: select(release_flag("RELEASE_CONSCRYPT_NSC"), {
        true: [
            "module/src/**/*.java",
        ],
        default: [
            "platform/src/**/*.java",
        ],
    }),
    visibility: [
        "//frameworks/base:__subpackages__",
    ],
}
+7 −0
Original line number Diff line number Diff line
# Bug component: 1479456

bessiej@google.com
brambonne@google.com
melisacz@google.com
sandrom@google.com
tweek@google.com
Loading