Bp/n/sFoo -> Bp/n/sHwFoo
Bug: 33554989
Test: hidl_test
Change-Id: I748181e9eaf5b78318054b9fd99ac1a43d00498a
diff --git a/tests/bar/1.0/Android.bp b/tests/bar/1.0/Android.bp
index e4c79fa..cad655c 100644
--- a/tests/bar/1.0/Android.bp
+++ b/tests/bar/1.0/Android.bp
@@ -28,18 +28,18 @@
out: [
"android/hardware/tests/bar/1.0/IBar.h",
"android/hardware/tests/bar/1.0/IHwBar.h",
- "android/hardware/tests/bar/1.0/BnBar.h",
- "android/hardware/tests/bar/1.0/BpBar.h",
+ "android/hardware/tests/bar/1.0/BnHwBar.h",
+ "android/hardware/tests/bar/1.0/BpHwBar.h",
"android/hardware/tests/bar/1.0/BsBar.h",
"android/hardware/tests/bar/1.0/IComplicated.h",
"android/hardware/tests/bar/1.0/IHwComplicated.h",
- "android/hardware/tests/bar/1.0/BnComplicated.h",
- "android/hardware/tests/bar/1.0/BpComplicated.h",
+ "android/hardware/tests/bar/1.0/BnHwComplicated.h",
+ "android/hardware/tests/bar/1.0/BpHwComplicated.h",
"android/hardware/tests/bar/1.0/BsComplicated.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/BnHwImportTypes.h",
+ "android/hardware/tests/bar/1.0/BpHwImportTypes.h",
"android/hardware/tests/bar/1.0/BsImportTypes.h",
],
}
diff --git a/tests/baz/1.0/Android.bp b/tests/baz/1.0/Android.bp
index 9caf809..4106838 100644
--- a/tests/baz/1.0/Android.bp
+++ b/tests/baz/1.0/Android.bp
@@ -32,18 +32,18 @@
"android/hardware/tests/baz/1.0/types.h",
"android/hardware/tests/baz/1.0/IBase.h",
"android/hardware/tests/baz/1.0/IHwBase.h",
- "android/hardware/tests/baz/1.0/BnBase.h",
- "android/hardware/tests/baz/1.0/BpBase.h",
+ "android/hardware/tests/baz/1.0/BnHwBase.h",
+ "android/hardware/tests/baz/1.0/BpHwBase.h",
"android/hardware/tests/baz/1.0/BsBase.h",
"android/hardware/tests/baz/1.0/IBaz.h",
"android/hardware/tests/baz/1.0/IHwBaz.h",
- "android/hardware/tests/baz/1.0/BnBaz.h",
- "android/hardware/tests/baz/1.0/BpBaz.h",
+ "android/hardware/tests/baz/1.0/BnHwBaz.h",
+ "android/hardware/tests/baz/1.0/BpHwBaz.h",
"android/hardware/tests/baz/1.0/BsBaz.h",
"android/hardware/tests/baz/1.0/IBazCallback.h",
"android/hardware/tests/baz/1.0/IHwBazCallback.h",
- "android/hardware/tests/baz/1.0/BnBazCallback.h",
- "android/hardware/tests/baz/1.0/BpBazCallback.h",
+ "android/hardware/tests/baz/1.0/BnHwBazCallback.h",
+ "android/hardware/tests/baz/1.0/BpHwBazCallback.h",
"android/hardware/tests/baz/1.0/BsBazCallback.h",
],
}
diff --git a/tests/expression/1.0/Android.bp b/tests/expression/1.0/Android.bp
index 80c4b3e..bb7aedd 100644
--- a/tests/expression/1.0/Android.bp
+++ b/tests/expression/1.0/Android.bp
@@ -25,13 +25,13 @@
out: [
"android/hardware/tests/expression/1.0/IExpression.h",
"android/hardware/tests/expression/1.0/IHwExpression.h",
- "android/hardware/tests/expression/1.0/BnExpression.h",
- "android/hardware/tests/expression/1.0/BpExpression.h",
+ "android/hardware/tests/expression/1.0/BnHwExpression.h",
+ "android/hardware/tests/expression/1.0/BpHwExpression.h",
"android/hardware/tests/expression/1.0/BsExpression.h",
"android/hardware/tests/expression/1.0/IExpressionExt.h",
"android/hardware/tests/expression/1.0/IHwExpressionExt.h",
- "android/hardware/tests/expression/1.0/BnExpressionExt.h",
- "android/hardware/tests/expression/1.0/BpExpressionExt.h",
+ "android/hardware/tests/expression/1.0/BnHwExpressionExt.h",
+ "android/hardware/tests/expression/1.0/BpHwExpressionExt.h",
"android/hardware/tests/expression/1.0/BsExpressionExt.h",
],
}
diff --git a/tests/foo/1.0/Android.bp b/tests/foo/1.0/Android.bp
index 171ea84..8294c65 100644
--- a/tests/foo/1.0/Android.bp
+++ b/tests/foo/1.0/Android.bp
@@ -38,28 +38,28 @@
"android/hardware/tests/foo/1.0/types.h",
"android/hardware/tests/foo/1.0/IFoo.h",
"android/hardware/tests/foo/1.0/IHwFoo.h",
- "android/hardware/tests/foo/1.0/BnFoo.h",
- "android/hardware/tests/foo/1.0/BpFoo.h",
+ "android/hardware/tests/foo/1.0/BnHwFoo.h",
+ "android/hardware/tests/foo/1.0/BpHwFoo.h",
"android/hardware/tests/foo/1.0/BsFoo.h",
"android/hardware/tests/foo/1.0/IFooCallback.h",
"android/hardware/tests/foo/1.0/IHwFooCallback.h",
- "android/hardware/tests/foo/1.0/BnFooCallback.h",
- "android/hardware/tests/foo/1.0/BpFooCallback.h",
+ "android/hardware/tests/foo/1.0/BnHwFooCallback.h",
+ "android/hardware/tests/foo/1.0/BpHwFooCallback.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/BnHwMyTypes.h",
+ "android/hardware/tests/foo/1.0/BpHwMyTypes.h",
"android/hardware/tests/foo/1.0/BsMyTypes.h",
"android/hardware/tests/foo/1.0/ISimple.h",
"android/hardware/tests/foo/1.0/IHwSimple.h",
- "android/hardware/tests/foo/1.0/BnSimple.h",
- "android/hardware/tests/foo/1.0/BpSimple.h",
+ "android/hardware/tests/foo/1.0/BnHwSimple.h",
+ "android/hardware/tests/foo/1.0/BpHwSimple.h",
"android/hardware/tests/foo/1.0/BsSimple.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/BnHwTheirTypes.h",
+ "android/hardware/tests/foo/1.0/BpHwTheirTypes.h",
"android/hardware/tests/foo/1.0/BsTheirTypes.h",
],
}
diff --git a/tests/inheritance/1.0/Android.bp b/tests/inheritance/1.0/Android.bp
index 2a6860b..4389147 100644
--- a/tests/inheritance/1.0/Android.bp
+++ b/tests/inheritance/1.0/Android.bp
@@ -31,23 +31,23 @@
out: [
"android/hardware/tests/inheritance/1.0/IChild.h",
"android/hardware/tests/inheritance/1.0/IHwChild.h",
- "android/hardware/tests/inheritance/1.0/BnChild.h",
- "android/hardware/tests/inheritance/1.0/BpChild.h",
+ "android/hardware/tests/inheritance/1.0/BnHwChild.h",
+ "android/hardware/tests/inheritance/1.0/BpHwChild.h",
"android/hardware/tests/inheritance/1.0/BsChild.h",
"android/hardware/tests/inheritance/1.0/IFetcher.h",
"android/hardware/tests/inheritance/1.0/IHwFetcher.h",
- "android/hardware/tests/inheritance/1.0/BnFetcher.h",
- "android/hardware/tests/inheritance/1.0/BpFetcher.h",
+ "android/hardware/tests/inheritance/1.0/BnHwFetcher.h",
+ "android/hardware/tests/inheritance/1.0/BpHwFetcher.h",
"android/hardware/tests/inheritance/1.0/BsFetcher.h",
"android/hardware/tests/inheritance/1.0/IGrandparent.h",
"android/hardware/tests/inheritance/1.0/IHwGrandparent.h",
- "android/hardware/tests/inheritance/1.0/BnGrandparent.h",
- "android/hardware/tests/inheritance/1.0/BpGrandparent.h",
+ "android/hardware/tests/inheritance/1.0/BnHwGrandparent.h",
+ "android/hardware/tests/inheritance/1.0/BpHwGrandparent.h",
"android/hardware/tests/inheritance/1.0/BsGrandparent.h",
"android/hardware/tests/inheritance/1.0/IParent.h",
"android/hardware/tests/inheritance/1.0/IHwParent.h",
- "android/hardware/tests/inheritance/1.0/BnParent.h",
- "android/hardware/tests/inheritance/1.0/BpParent.h",
+ "android/hardware/tests/inheritance/1.0/BnHwParent.h",
+ "android/hardware/tests/inheritance/1.0/BpHwParent.h",
"android/hardware/tests/inheritance/1.0/BsParent.h",
],
}
diff --git a/tests/libhwbinder/1.0/Android.bp b/tests/libhwbinder/1.0/Android.bp
index 8730665..8c27225 100644
--- a/tests/libhwbinder/1.0/Android.bp
+++ b/tests/libhwbinder/1.0/Android.bp
@@ -22,8 +22,8 @@
out: [
"android/hardware/tests/libhwbinder/1.0/IBenchmark.h",
"android/hardware/tests/libhwbinder/1.0/IHwBenchmark.h",
- "android/hardware/tests/libhwbinder/1.0/BnBenchmark.h",
- "android/hardware/tests/libhwbinder/1.0/BpBenchmark.h",
+ "android/hardware/tests/libhwbinder/1.0/BnHwBenchmark.h",
+ "android/hardware/tests/libhwbinder/1.0/BpHwBenchmark.h",
"android/hardware/tests/libhwbinder/1.0/BsBenchmark.h",
],
}
diff --git a/tests/memory/1.0/Android.bp b/tests/memory/1.0/Android.bp
index 155677f..d8fe811 100644
--- a/tests/memory/1.0/Android.bp
+++ b/tests/memory/1.0/Android.bp
@@ -22,8 +22,8 @@
out: [
"android/hardware/tests/memory/1.0/IMemoryTest.h",
"android/hardware/tests/memory/1.0/IHwMemoryTest.h",
- "android/hardware/tests/memory/1.0/BnMemoryTest.h",
- "android/hardware/tests/memory/1.0/BpMemoryTest.h",
+ "android/hardware/tests/memory/1.0/BnHwMemoryTest.h",
+ "android/hardware/tests/memory/1.0/BpHwMemoryTest.h",
"android/hardware/tests/memory/1.0/BsMemoryTest.h",
],
}
diff --git a/tests/msgq/1.0/Android.bp b/tests/msgq/1.0/Android.bp
index f2e257b..669722e 100644
--- a/tests/msgq/1.0/Android.bp
+++ b/tests/msgq/1.0/Android.bp
@@ -22,8 +22,8 @@
out: [
"android/hardware/tests/msgq/1.0/ITestMsgQ.h",
"android/hardware/tests/msgq/1.0/IHwTestMsgQ.h",
- "android/hardware/tests/msgq/1.0/BnTestMsgQ.h",
- "android/hardware/tests/msgq/1.0/BpTestMsgQ.h",
+ "android/hardware/tests/msgq/1.0/BnHwTestMsgQ.h",
+ "android/hardware/tests/msgq/1.0/BpHwTestMsgQ.h",
"android/hardware/tests/msgq/1.0/BsTestMsgQ.h",
],
}
diff --git a/tests/pointer/1.0/Android.bp b/tests/pointer/1.0/Android.bp
index d1ffda6..be7f873 100644
--- a/tests/pointer/1.0/Android.bp
+++ b/tests/pointer/1.0/Android.bp
@@ -25,13 +25,13 @@
out: [
"android/hardware/tests/pointer/1.0/IGraph.h",
"android/hardware/tests/pointer/1.0/IHwGraph.h",
- "android/hardware/tests/pointer/1.0/BnGraph.h",
- "android/hardware/tests/pointer/1.0/BpGraph.h",
+ "android/hardware/tests/pointer/1.0/BnHwGraph.h",
+ "android/hardware/tests/pointer/1.0/BpHwGraph.h",
"android/hardware/tests/pointer/1.0/BsGraph.h",
"android/hardware/tests/pointer/1.0/IPointer.h",
"android/hardware/tests/pointer/1.0/IHwPointer.h",
- "android/hardware/tests/pointer/1.0/BnPointer.h",
- "android/hardware/tests/pointer/1.0/BpPointer.h",
+ "android/hardware/tests/pointer/1.0/BnHwPointer.h",
+ "android/hardware/tests/pointer/1.0/BpHwPointer.h",
"android/hardware/tests/pointer/1.0/BsPointer.h",
],
}