Merge "Add aconfig_declarations for flags in android_core_networking" into main

This commit is contained in:
Treehugger Robot
2023-10-06 12:02:37 +00:00
committed by Gerrit Code Review
2 changed files with 23 additions and 0 deletions

View File

@@ -19,6 +19,8 @@ package {
default_applicable_licenses: ["Android-Apache-2.0"], default_applicable_licenses: ["Android-Apache-2.0"],
} }
build = ["TrunkStable.bp"]
// This is a placeholder comment to avoid merge conflicts // This is a placeholder comment to avoid merge conflicts
// as the above target may not exist // as the above target may not exist
// depending on the branch // depending on the branch

21
common/TrunkStable.bp Normal file
View File

@@ -0,0 +1,21 @@
//
// Copyright (C) 2023 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.
//
aconfig_declarations {
name: "com.android.net.flags-aconfig",
package: "com.android.net.flags",
srcs: ["flags.aconfig"],
}