Merge "Add SystemMessages protos to Connectivity" am: 805b39b2d9 am: bd85dbeb41 (898073e3) · Commits · e / os / android_frameworks_base

packages/Connectivity/service/Android.bp

+16 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,7 @@ java_library {
		"net-utils-framework-common",
		"netd-client",
		"PlatformProperties",
		"service-connectivity-protos",
		],
		apex_available: [
		"//apex_available:platform",
		@@ -75,6 +76,21 @@ java_library {
		],
		}

		java_library {
		name: "service-connectivity-protos",
		proto: {
		type: "nano",
		},
		srcs: [
		":system-messages-proto-src",
		],
		libs: ["libprotobuf-java-nano"],
		apex_available: [
		"//apex_available:platform",
		"com.android.tethering",
		],
		}

		java_library {
		name: "service-connectivity",
		installable: true,

+3 −0

Original line number	Diff line number	Diff line
		@@ -12,3 +12,6 @@ rule android.util.LocalLog* com.android.connectivity.util.LocalLog@1
		# the one in com.android.internal.util
		rule android.util.IndentingPrintWriter* android.connectivity.util.IndentingPrintWriter@1
		rule com.android.internal.util.** com.android.connectivity.util.@1

		rule com.android.internal.messages.** com.android.connectivity.messages.@1
		rule com.google.protobuf.** com.android.connectivity.protobuf.@1

0 → 100644

+20 −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.
		*/

		syntax = "proto2";

		// Connectivity protos can be created in this directory. Note this file must be included before
		// building system-messages-proto, otherwise it will not build by itself.