diff options
| author | 2016-01-12 23:09:52 +0000 | |
|---|---|---|
| committer | 2016-01-12 23:09:52 +0000 | |
| commit | 2e37bfd2d2f629ca50ecf0e6674484cd30560d26 (patch) | |
| tree | 129c1d92b07fb538a07f8ff8724cfbd87041853f | |
| parent | 6fa9c5cd01e36c62d5ad7efa230d4e52f457c148 (diff) | |
| parent | 239951a91eedfc4c45b80f01264da8ec1ef10e3a (diff) | |
Merge "Remove PersistableBundle.aidl from Java framework"
| -rw-r--r-- | Android.mk | 6 | ||||
| -rw-r--r-- | core/java/android/os/PersistableBundle.aidl | 20 |
2 files changed, 4 insertions, 22 deletions
diff --git a/Android.mk b/Android.mk index 5e405d365f84..f56445940537 100644 --- a/Android.mk +++ b/Android.mk @@ -415,7 +415,9 @@ LOCAL_SRC_FILES += \ packages/services/Proxy/com/android/net/IProxyPortListener.aidl \ # FRAMEWORKS_BASE_JAVA_SRC_DIRS comes from build/core/pathmap.mk -LOCAL_AIDL_INCLUDES += $(FRAMEWORKS_BASE_JAVA_SRC_DIRS) +LOCAL_AIDL_INCLUDES += \ + $(FRAMEWORKS_BASE_JAVA_SRC_DIRS) \ + frameworks/native/aidl/binder LOCAL_INTERMEDIATE_SOURCES := \ $(framework_res_source_path)/android/R.java \ @@ -513,7 +515,6 @@ aidl_files := \ frameworks/base/core/java/android/os/ParcelUuid.aidl \ frameworks/base/core/java/android/os/ParcelFileDescriptor.aidl \ frameworks/base/core/java/android/os/ResultReceiver.aidl \ - frameworks/base/core/java/android/os/PersistableBundle.aidl \ frameworks/base/core/java/android/os/WorkSource.aidl \ frameworks/base/core/java/android/os/DropBoxManager.aidl \ frameworks/base/core/java/android/os/Bundle.aidl \ @@ -620,6 +621,7 @@ aidl_files := \ frameworks/base/core/java/android/bluetooth/le/ScanResult.aidl \ frameworks/base/core/java/android/bluetooth/BluetoothDevice.aidl \ frameworks/base/core/java/android/database/CursorWindow.aidl \ + frameworks/native/aidl/binder/android/os/PersistableBundle.aidl \ gen := $(TARGET_OUT_COMMON_INTERMEDIATES)/framework.aidl $(gen): PRIVATE_SRC_FILES := $(aidl_files) diff --git a/core/java/android/os/PersistableBundle.aidl b/core/java/android/os/PersistableBundle.aidl deleted file mode 100644 index 94e86076308d..000000000000 --- a/core/java/android/os/PersistableBundle.aidl +++ /dev/null @@ -1,20 +0,0 @@ -/* -** -** Copyright 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.os; - -parcelable PersistableBundle cpp_header "binder/PersistableBundle.h"; |