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

Commit 10606941 authored by Robin Lee's avatar Robin Lee
Browse files

Move UidRange aidl declaration to system/netd 

Which owns the native UidRange.cpp, so it makes more sense for the
declaration to live there since frameworks/base depends on netd but not
vice versa.

Bug: 26694104
Change-Id: I0efda77713ee6f0ec8070fb0e09a694b95f6cd25
parent bae147f1

Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -474,7 +474,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 \
@@ -690,6 +691,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)

core/java/android/net/UidRange.aidl

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;

services/core/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ LOCAL_SRC_FILES += \ 
    java/com/android/server/am/EventLogTags.logtags \

    ../../../../system/netd/server/binder/android/net/INetd.aidl



LOCAL_AIDL_INCLUDES += \

    system/netd/server/binder



LOCAL_JAVA_LIBRARIES := services.net telephony-common

LOCAL_STATIC_JAVA_LIBRARIES := tzdata_update