Split parcelable .aidl files to aidl-export
The one-line "parcelable X" files need to be imported by targets that do not build against SDK (the SDK has prebuilt definitions), so prepare a dedicated directory for them. This avoids having users of the classes include the whole src/ directory, which could contain definitions for classes that are not part of the public API, so should not be imported. Also move back to frameworks/base/core some .aidl definitions that were separated from their associated class. Bug: 171540887 Test: m Merged-In: I7432fe4c87cd3cab04dcb6185c9a4f3f84376549 Change-Id: I7432fe4c87cd3cab04dcb6185c9a4f3f84376549
This commit is contained in:
@@ -14,7 +14,6 @@
|
|||||||
// limitations under the License.
|
// limitations under the License.
|
||||||
//
|
//
|
||||||
|
|
||||||
// TODO: use a java_library in the bootclasspath instead
|
|
||||||
package {
|
package {
|
||||||
// See: http://go/android-license-faq
|
// See: http://go/android-license-faq
|
||||||
// A large-scale-change added 'default_applicable_licenses' to import
|
// A large-scale-change added 'default_applicable_licenses' to import
|
||||||
@@ -24,13 +23,37 @@ package {
|
|||||||
default_applicable_licenses: ["frameworks_base_license"],
|
default_applicable_licenses: ["frameworks_base_license"],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO: use a java_library in the bootclasspath instead
|
||||||
filegroup {
|
filegroup {
|
||||||
name: "framework-connectivity-sources",
|
name: "framework-connectivity-internal-sources",
|
||||||
srcs: [
|
srcs: [
|
||||||
"src/**/*.java",
|
"src/**/*.java",
|
||||||
"src/**/*.aidl",
|
"src/**/*.aidl",
|
||||||
],
|
],
|
||||||
path: "src",
|
path: "src",
|
||||||
|
visibility: [
|
||||||
|
"//visibility:private",
|
||||||
|
],
|
||||||
|
}
|
||||||
|
|
||||||
|
filegroup {
|
||||||
|
name: "framework-connectivity-aidl-export-sources",
|
||||||
|
srcs: [
|
||||||
|
"aidl-export/**/*.aidl",
|
||||||
|
],
|
||||||
|
path: "aidl-export",
|
||||||
|
visibility: [
|
||||||
|
"//visibility:private",
|
||||||
|
],
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: use a java_library in the bootclasspath instead
|
||||||
|
filegroup {
|
||||||
|
name: "framework-connectivity-sources",
|
||||||
|
srcs: [
|
||||||
|
":framework-connectivity-internal-sources",
|
||||||
|
":framework-connectivity-aidl-export-sources",
|
||||||
|
],
|
||||||
visibility: [
|
visibility: [
|
||||||
"//frameworks/base",
|
"//frameworks/base",
|
||||||
"//packages/modules/Connectivity:__subpackages__",
|
"//packages/modules/Connectivity:__subpackages__",
|
||||||
|
|||||||
@@ -1,20 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2016 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;
|
|
||||||
|
|
||||||
/** {@hide} */
|
|
||||||
parcelable ConnectivityMetricsEvent;
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
/**
|
|
||||||
* Copyright (c) 2008, 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;
|
|
||||||
|
|
||||||
parcelable InterfaceConfiguration;
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2018 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;
|
|
||||||
Reference in New Issue
Block a user