summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJoe Onorato <joeo@google.com>2011-10-18 18:17:32 -0700
committerJoe Onorato <joeo@google.com>2011-10-18 18:17:32 -0700
commit2be34eece26072ee8dcc6c0ec7ba5a5ebd342490 (patch)
tree5d0bb6ddd2e229fdec70915b9c027b29060a9f76 /tools
parentbaeeda7eb2fd230fc36242916563dcb93618ee62 (diff)
downloadframeworks_base-2be34eece26072ee8dcc6c0ec7ba5a5ebd342490.zip
frameworks_base-2be34eece26072ee8dcc6c0ec7ba5a5ebd342490.tar.gz
frameworks_base-2be34eece26072ee8dcc6c0ec7ba5a5ebd342490.tar.bz2
Revert "Treat parcelables as flattenables for now, until the sdk contains a newer aidl."
This reverts commit 234b5a2b98471c663811f4b2b44a98028fa8e623.
Diffstat (limited to 'tools')
-rw-r--r--tools/aidl/aidl_language_y.y4
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/aidl/aidl_language_y.y b/tools/aidl/aidl_language_y.y
index 4b1442a..cc04d15 100644
--- a/tools/aidl/aidl_language_y.y
+++ b/tools/aidl/aidl_language_y.y
@@ -87,9 +87,7 @@ parcelable_decl:
b->name = $2.buffer;
b->package = g_currentPackage ? strdup(g_currentPackage) : NULL;
b->semicolon_token = $3.buffer;
- // TODO: Since we're having problems with funbundling, make all parcelables also flattenables.
- // b->flattening_methods = PARCELABLE_DATA;
- b->flattening_methods = PARCELABLE_DATA | RPC_DATA;
+ b->flattening_methods = PARCELABLE_DATA;
$$.user_data = b;
}
| PARCELABLE ';' {