Merge "Add test for importing a single type." (ccdc4699) · Commits · e / os / android_hardware_interfaces

tests/bar/1.0/Android.bp

+8 −0

Original line number	Diff line number	Diff line
		@@ -6,9 +6,11 @@ genrule {
		cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.tests.bar@1.0",
		srcs: [
		"IBar.hal",
		"IImportTypes.hal",
		],
		out: [
		"android/hardware/tests/bar/1.0/BarAll.cpp",
		"android/hardware/tests/bar/1.0/ImportTypesAll.cpp",
		],
		}

		@@ -18,6 +20,7 @@ genrule {
		cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.tests.bar@1.0",
		srcs: [
		"IBar.hal",
		"IImportTypes.hal",
		],
		out: [
		"android/hardware/tests/bar/1.0/IBar.h",
		@@ -25,6 +28,11 @@ genrule {
		"android/hardware/tests/bar/1.0/BnBar.h",
		"android/hardware/tests/bar/1.0/BpBar.h",
		"android/hardware/tests/bar/1.0/BsBar.h",
		"android/hardware/tests/bar/1.0/IImportTypes.h",
		"android/hardware/tests/bar/1.0/IHwImportTypes.h",
		"android/hardware/tests/bar/1.0/BnImportTypes.h",
		"android/hardware/tests/bar/1.0/BpImportTypes.h",
		"android/hardware/tests/bar/1.0/BsImportTypes.h",
		],
		}

+6 −0

Original line number	Diff line number	Diff line
		@@ -17,10 +17,16 @@
		package android.hardware.tests.bar@1.0;

		import android.hardware.tests.foo@1.0::IFoo;
		import android.hardware.tests.foo@1.0::Unrelated;

		interface IBar extends android.hardware.tests.foo@1.0::IFoo {

		typedef android.hardware.tests.foo@1.0::IFoo FunkyAlias;
		typedef Unrelated Related;

		struct SomethingRelated {
		Related myRelated;
		};

		thisIsNew();
		};

0 → 100644

+28 −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.bar@1.0;

		import android.hardware.tests.foo@1.0::types;

		interface IImportTypes {
		typedef Unrelated Related;
		struct GoodStruct {
		Outer outer;
		android.hardware.tests.foo@1.0::Outer.Inner inner;
		@1.0::Outer.Inner.Deep deep;
		};
		};

+16 −0

Original line number	Diff line number	Diff line
		@@ -8,11 +8,15 @@ genrule {
		"types.hal",
		"IFoo.hal",
		"IFooCallback.hal",
		"IMyTypes.hal",
		"ITheirTypes.hal",
		],
		out: [
		"android/hardware/tests/foo/1.0/types.cpp",
		"android/hardware/tests/foo/1.0/FooAll.cpp",
		"android/hardware/tests/foo/1.0/FooCallbackAll.cpp",
		"android/hardware/tests/foo/1.0/MyTypesAll.cpp",
		"android/hardware/tests/foo/1.0/TheirTypesAll.cpp",
		],
		}

		@@ -24,6 +28,8 @@ genrule {
		"types.hal",
		"IFoo.hal",
		"IFooCallback.hal",
		"IMyTypes.hal",
		"ITheirTypes.hal",
		],
		out: [
		"android/hardware/tests/foo/1.0/types.h",
		@@ -37,6 +43,16 @@ genrule {
		"android/hardware/tests/foo/1.0/BnFooCallback.h",
		"android/hardware/tests/foo/1.0/BpFooCallback.h",
		"android/hardware/tests/foo/1.0/BsFooCallback.h",
		"android/hardware/tests/foo/1.0/IMyTypes.h",
		"android/hardware/tests/foo/1.0/IHwMyTypes.h",
		"android/hardware/tests/foo/1.0/BnMyTypes.h",
		"android/hardware/tests/foo/1.0/BpMyTypes.h",
		"android/hardware/tests/foo/1.0/BsMyTypes.h",
		"android/hardware/tests/foo/1.0/ITheirTypes.h",
		"android/hardware/tests/foo/1.0/IHwTheirTypes.h",
		"android/hardware/tests/foo/1.0/BnTheirTypes.h",
		"android/hardware/tests/foo/1.0/BpTheirTypes.h",
		"android/hardware/tests/foo/1.0/BsTheirTypes.h",
		],
		}

+7 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,8 @@
		package android.hardware.tests.foo@1.0;

		import IFooCallback;
		import IMyTypes.SomeStruct;
		import ITheirTypes.FloatArray;

		interface IFoo {

		@@ -72,6 +74,11 @@ interface IFoo {
		ThreeStrings[5] s;
		};

		struct MyStruct {
		SomeStruct innerStruct;
		FloatArray myFloatArray;
		};

		doThis(float param);
		doThatAndReturnSomething(int64_t param) generates (int32_t result);
		doQuiteABit(int32_t a, int64_t b, float c, double d) generates (double something);