Merge "Move UidRange aidl declaration to system/netd" into nyc-dev (e7c7d77f) · Commits · e / os / android_frameworks_base

Android.mk

+3 −1

Original line number	Diff line number	Diff line
		@@ -472,7 +472,8 @@ LOCAL_AIDL_INCLUDES += \

		LOCAL_AIDL_INCLUDES += \
		frameworks/av/camera/aidl \
		frameworks/native/aidl/gui
		frameworks/native/aidl/gui \
		system/netd/server/binder

		LOCAL_INTERMEDIATE_SOURCES := \
		$(framework_res_source_path)/android/R.java \
		@@ -687,6 +688,7 @@ aidl_files := \
		frameworks/base/core/java/android/database/CursorWindow.aidl \
		frameworks/base/core/java/android/service/quicksettings/Tile.aidl \
		frameworks/native/aidl/binder/android/os/PersistableBundle.aidl \
		system/netd/server/binder/android/net/UidRange.aidl \

		gen := $(TARGET_OUT_COMMON_INTERMEDIATES)/framework.aidl
		$(gen): PRIVATE_SRC_FILES := $(aidl_files)

deleted100644 → 0

+0 −24

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014 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 android.net;

		/**
		* An inclusive range of UIDs.
		*
		* {@hide}
		*/
		parcelable UidRange;

+3 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,9 @@ LOCAL_SRC_FILES += \
		../../../../system/netd/server/binder/android/net/INetd.aidl \
		../../../../system/netd/server/binder/android/net/metrics/IDnsEventListener.aidl \

		LOCAL_AIDL_INCLUDES += \
		system/netd/server/binder

		LOCAL_JAVA_LIBRARIES := services.net telephony-common
		LOCAL_STATIC_JAVA_LIBRARIES := tzdata_update