Skip to content
Snippets Groups Projects
Commit 0565803e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add aconfig_declarations for flags in android_core_networking" into main

parents 87d128f4 e63d38ff
No related branches found
No related tags found
No related merge requests found
......@@ -19,6 +19,8 @@ package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
build = ["TrunkStable.bp"]
// This is a placeholder comment to avoid merge conflicts
// as the above target may not exist
// depending on the branch
......
//
// 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"],
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment