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

Commit 239951a9 authored by Samuel Tan's avatar Samuel Tan
Browse files

Remove PersistableBundle.aidl from Java framework 

Remove PersistableBundle.aidl from the Java framework, since it
has been moved to the native libbinder.

BUG: 26292234
Change-Id: Ia3dc49a3ad92f4c579e6dff0606c1db8fb3be76b
TEST: aosp_arm builds successfully.
parent a15ef2ab

Android.mk

+4 −2
Original line number Original line Diff line number Diff line
@@ -415,7 +415,9 @@ LOCAL_SRC_FILES += \ 
	packages/services/Proxy/com/android/net/IProxyPortListener.aidl \

	packages/services/Proxy/com/android/net/IProxyPortListener.aidl \





# FRAMEWORKS_BASE_JAVA_SRC_DIRS comes from build/core/pathmap.mk

# 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 := \

LOCAL_INTERMEDIATE_SOURCES := \

			$(framework_res_source_path)/android/R.java \

			$(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/ParcelUuid.aidl \

	frameworks/base/core/java/android/os/ParcelFileDescriptor.aidl \

	frameworks/base/core/java/android/os/ParcelFileDescriptor.aidl \

	frameworks/base/core/java/android/os/ResultReceiver.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/WorkSource.aidl \

	frameworks/base/core/java/android/os/DropBoxManager.aidl \

	frameworks/base/core/java/android/os/DropBoxManager.aidl \

	frameworks/base/core/java/android/os/Bundle.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/le/ScanResult.aidl \

	frameworks/base/core/java/android/bluetooth/BluetoothDevice.aidl \

	frameworks/base/core/java/android/bluetooth/BluetoothDevice.aidl \

	frameworks/base/core/java/android/database/CursorWindow.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 := $(TARGET_OUT_COMMON_INTERMEDIATES)/framework.aidl

$(gen): PRIVATE_SRC_FILES := $(aidl_files)

$(gen): PRIVATE_SRC_FILES := $(aidl_files)

core/java/android/os/PersistableBundle.aidl

deleted100644 → 0
+0 −20
Original line number Original line Diff line number Diff line 
/*

**

** 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";