Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c397242 authored by Andreas Huber's avatar Andreas Huber Committed by android-build-merger
Browse files

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

Merge "Verify that structs with multiple array fields now successfully compile for Java" am: 05f80eec am: a37cd4c0
am: 33271e9d

Change-Id: Ie56f1068c7f870b39f0ba8223e4c849e972f3575
parents 1a54b1be 33271e9d

tests/baz/1.0/IBase.hal

+26 −0
Original line number Diff line number Diff line 
/*

 * 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 @@ interface IBase { 
        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

+16 −0
Original line number Diff line number Diff line 
/*

 * 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

+16 −0
Original line number Diff line number Diff line 
/*

 * 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 {