summaryrefslogtreecommitdiffstats
path: root/tools/aidl
diff options
context:
space:
mode:
authorJoe Onorato <joeo@google.com>2011-11-03 17:06:32 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-03 17:06:32 -0700
commitf1d897d996eccf272364fe8733e552d799606901 (patch)
treea76751567e5e5bea48a8160740b72b58f4b986a8 /tools/aidl
parente4e1e7ecc3728c66ca0524f09c922d88489911a6 (diff)
parent6e5cb4b38a96bc1ba2fe760b5e3d61a93e011ce6 (diff)
downloadframeworks_base-f1d897d996eccf272364fe8733e552d799606901.zip
frameworks_base-f1d897d996eccf272364fe8733e552d799606901.tar.gz
frameworks_base-f1d897d996eccf272364fe8733e552d799606901.tar.bz2
Merge "This should fix the build for now." into ics-aah
Diffstat (limited to 'tools/aidl')
-rwxr-xr-xtools/aidl/Type.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/aidl/Type.cpp b/tools/aidl/Type.cpp
index b84b3c4..5348f1e 100755
--- a/tools/aidl/Type.cpp
+++ b/tools/aidl/Type.cpp
@@ -899,7 +899,8 @@ ListType::CreateFromRpcData(StatementBlock* addTo, Expression* k, Variable* v, V
UserDataType::UserDataType(const string& package, const string& name,
bool builtIn, bool canWriteToParcel, bool canWriteToRpcData,
const string& declFile, int declLine)
- :Type(package, name, builtIn ? BUILT_IN : USERDATA, canWriteToParcel, canWriteToRpcData,
+ //:Type(package, name, builtIn ? BUILT_IN : USERDATA, canWriteToParcel, canWriteToRpcData,
+ :Type(package, name, builtIn ? BUILT_IN : USERDATA, true, true,
true, declFile, declLine)
{
}