commit 05f80eec9d88ca11e63f06096d18c0192eeb0e41
author Treehugger Robot <treehugger-gerrit@google.com> Thu Sep 22 19:53:14 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 22 19:53:14 2016 +0000
tree da7758efa58396ee21e8e791ad823c81f8dfbfc6
parent 5443a9fc9b7e7f334cd298aea19741290ad55555
parent fc0b6c484aab6c2853f14d005ecc76f6cb1b75ce

Merge "Verify that structs with multiple array fields now successfully compile for Java"

tests/baz/1.0/IBase.hal

diff --git a/tests/baz/1.0/IBase.hal b/tests/baz/1.0/IBase.hal
index eb87013..9e8c641 100644
--- a/tests/baz/1.0/IBase.hal
+++ b/tests/baz/1.0/IBase.hal
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2016 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.hardware.tests.baz@1.0;
 
 interface IBase {
@@ -21,6 +37,16 @@
         Bar y;
     };
 
+    struct MoreThanOneArrayField {
+        /*
+         * Generated (Java) code used to redeclare the same variable name
+         * multiple times in the same scope, this test ensures that that's no
+         * longer the case.
+         */
+        string[3] one;
+        string[5] two;
+    };
+
     typedef string[3] ThreeStrings;
     typedef string[5] FiveStrings;
 

tests/baz/1.0/IBaz.hal

diff --git a/tests/baz/1.0/IBaz.hal b/tests/baz/1.0/IBaz.hal
index a6230b9..4cb9689 100644
--- a/tests/baz/1.0/IBaz.hal
+++ b/tests/baz/1.0/IBaz.hal
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2016 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.hardware.tests.baz@1.0;
 
 import IBase;

tests/baz/1.0/IBazCallback.hal

diff --git a/tests/baz/1.0/IBazCallback.hal b/tests/baz/1.0/IBazCallback.hal
index 858e8c9..b59a107 100644
--- a/tests/baz/1.0/IBazCallback.hal
+++ b/tests/baz/1.0/IBazCallback.hal
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2016 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.hardware.tests.baz@1.0;
 
 interface IBazCallback {