commit 8f02a53bba40de65fa97f618c7aba00473018bd1
author Jeongik Cha <jeongik@google.com> Wed Oct 14 00:16:28 2020 +0900
committer Jeongik Cha <jeongik@google.com> Wed Oct 21 00:42:06 2020 +0000
tree 448d84757778d866814b63f7ca35bf19b8bad911
parent 1b4256ac985858a67819e7b37bb1dca54c8c5a42

Support ParcelableHolder in NDK

Bug: 146611855
Test: atest CtsNdkBinderTest aidl_unittests aidl_integration_test
Change-Id: Ic3beb6f650b484d0a67f613ca77c03f4aac6b4bf

aidl_unittest.cpp

diff --git a/aidl_unittest.cpp b/aidl_unittest.cpp
index 60f99ef..f479f08 100644
--- a/aidl_unittest.cpp
+++ b/aidl_unittest.cpp
@@ -1231,10 +1231,10 @@
       "  ParcelableHolder extension;\n"
       "  ParcelableHolder extension2;\n"
       "}";
-  if (GetLanguage() == Options::Language::NDK || GetLanguage() == Options::Language::RUST) {
+  if (GetLanguage() == Options::Language::RUST) {
     EXPECT_EQ(nullptr, Parse("a/Data.aidl", extendable_parcelable, typenames_, GetLanguage()));
     EXPECT_EQ(
-        "ERROR: a/Data.aidl:2.1-19: The NDK and Rust backend does not support ParcelableHolder "
+        "ERROR: a/Data.aidl:2.1-19: The Rust backend does not support ParcelableHolder "
         "yet.\n",
         GetCapturedStderr());
   } else {
@@ -1251,10 +1251,10 @@
   EXPECT_EQ(nullptr,
             Parse("a/IFoo.aidl", parcelableholder_return_interface, typenames_, GetLanguage()));
 
-  if (GetLanguage() == Options::Language::NDK || GetLanguage() == Options::Language::RUST) {
+  if (GetLanguage() == Options::Language::RUST) {
     EXPECT_EQ(
         "ERROR: a/IFoo.aidl:2.19-23: ParcelableHolder cannot be a return type\n"
-        "ERROR: a/IFoo.aidl:2.1-19: The NDK and Rust backend does not support ParcelableHolder "
+        "ERROR: a/IFoo.aidl:2.1-19: The Rust backend does not support ParcelableHolder "
         "yet.\n",
         GetCapturedStderr());
     return;
@@ -1272,10 +1272,10 @@
   EXPECT_EQ(nullptr,
             Parse("a/IFoo.aidl", extendable_parcelable_arg_interface, typenames_, GetLanguage()));
 
-  if (GetLanguage() == Options::Language::NDK || GetLanguage() == Options::Language::RUST) {
+  if (GetLanguage() == Options::Language::RUST) {
     EXPECT_EQ(
         "ERROR: a/IFoo.aidl:2.31-34: ParcelableHolder cannot be an argument type\n"
-        "ERROR: a/IFoo.aidl:2.14-31: The NDK and Rust backend does not support ParcelableHolder "
+        "ERROR: a/IFoo.aidl:2.14-31: The Rust backend does not support ParcelableHolder "
         "yet.\n",
         GetCapturedStderr());
     return;