commit 2be34eece26072ee8dcc6c0ec7ba5a5ebd342490
author Joe Onorato <joeo@google.com> Tue Oct 18 18:17:32 2011 -0700
committer Joe Onorato <joeo@google.com> Tue Oct 18 18:17:32 2011 -0700
tree 5d0bb6ddd2e229fdec70915b9c027b29060a9f76
parent baeeda7eb2fd230fc36242916563dcb93618ee62

Revert "Treat parcelables as flattenables for now, until the sdk contains a newer aidl."

This reverts commit 234b5a2b98471c663811f4b2b44a98028fa8e623.

tools/aidl/aidl_language_y.y

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 @@
                                                         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 ';'                              {