Commit graph

428 commits

Author SHA1 Message Date
Jiyong Park
d005c3ea41 Mark android.hardware.tests.trie as a test HAL interface
Bug: 64776708
Test: no android.hardware.tests.*.so file in
/system/lib[64]/vndk on 2017 pixel devices

Change-Id: I896798a77be2ee0295fbdc39ae0834492d29e3b9
2017-09-15 14:23:09 +09:00
Jiyong Park
b5e9a6bdc3 HAL interface libs for testing are built w/o VNDK.
The HAL interfaces for testing were copied to /system/lib[64]/vndk
directory since they are built as cc_library and thus falsely recognized
as members of VNDK, which isn't true.

Build them as non-VNDK so that they are filtered out. To do so,
.hidl_for_test files are added for the test HALs and update-makefiles.sh
were ran.

Bug: 64776708
Test: no android.hardware.tests.*.so file in /system/lib[64]/vndk on
2017 pixel devices

Merged-In: I6167da8572081adfb53f432b248ac3bbee39dc42
Change-Id: I6167da8572081adfb53f432b248ac3bbee39dc42
(cherry picked from commit 526a36ca24)
2017-09-15 13:33:41 +09:00
Jiyong Park
ff9184f589 Merge "HAL interface libs for testing are built w/o VNDK." into oc-mr1-dev
am: 3f2c1c1b1c

Change-Id: Ia22024ddbc0566f302f7061cbe89d72196b4c318
2017-09-15 04:17:19 +00:00
Yifan Hong
38b892522c Merge "Revert "HAL interface libs for testing are now built as test lib"" into oc-mr1-dev
am: 1f87d477ee

Change-Id: Id4a7dd4f77b2adcdc4ca89f3e77ed1e6432535ad
2017-09-15 02:52:11 +00:00
Jiyong Park
526a36ca24 HAL interface libs for testing are built w/o VNDK.
The HAL interfaces for testing were copied to /system/lib[64]/vndk
directory since they are built as cc_library and thus falsely recognized
as members of VNDK, which isn't true.

Build them as non-VNDK so that they are filtered out. To do so,
.hidl_for_test files are added for the test HALs and update-makefiles.sh
were ran.

Bug: 64776708
Test: no android.hardware.tests.*.so file in /system/lib[64]/vndk on
2017 pixel devices

Change-Id: I6167da8572081adfb53f432b248ac3bbee39dc42
2017-09-14 15:52:43 -07:00
Yifan Hong
3d720e671a Revert "HAL interface libs for testing are now built as test lib"
This reverts commit 9a4b17e3e1.

Reason of revert: this breaks hidl_test / lshal_test

Bug: 65603915

Change-Id: I73427657615ab9c7e3c0c7d336f03510d9a53fe6
2017-09-14 20:12:48 +00:00
Steven Moreland
0cf302463a Add test for fq reference to local type.
Test: m hidl_test (checks are done statically)
Bug: 65597200
Change-Id: I6e73414dab00c3bf5a4684c5f839333e582e7cd7
2017-09-14 12:00:59 -07:00
Timur Iskhakov
9b2f0f1926 Merge "Print full name test" am: b5aef5a54d am: 617656f549 am: 99bd58cf4b
am: 5cbe90c520

Change-Id: I740e1b5d979f844270d65c6d3fffad1af5735961
2017-09-14 06:09:47 +00:00
Timur Iskhakov
528f0f1387 Merge "Test HIDL topological reordering" am: 0495818b3b am: 41953e0c17 am: 681a5b4855
am: 69e876fe42

Change-Id: If202932e68647f798e2b46c698237cee73b797e3
2017-09-14 05:59:38 +00:00
Timur Iskhakov
5cbe90c520 Merge "Print full name test" am: b5aef5a54d am: 617656f549
am: 99bd58cf4b

Change-Id: Id143f51f50329025c1e3f11a30a38b701fe4f266
2017-09-14 05:42:29 +00:00
Treehugger Robot
b5aef5a54d Merge "Print full name test" 2017-09-14 03:21:32 +00:00
Timur Iskhakov
d5112d3442 Merge "Interface for hidl forward reference test" am: 1b08076ad5 am: 812f779dfe am: 98e9734797
am: 3efd584fe4

Change-Id: If4a39cec2c9f34c0a39eaddb785706d5498760df
2017-09-14 02:24:15 +00:00
Zhuoyao Zhang
62424377c5 Merge "Update build for test hal: libhwbinder" am: 754d21772a am: 597f08a47b am: bf3c5d96c8
am: cf44876032

Change-Id: Ifc11c0bae4a8d8f15427e79c4a50ee3009d5d477
2017-09-14 02:23:30 +00:00
Timur Iskhakov
69e876fe42 Merge "Test HIDL topological reordering" am: 0495818b3b am: 41953e0c17
am: 681a5b4855

Change-Id: I23cada29a4da527df8524e2c6138fa2e3564a774
2017-09-14 01:48:55 +00:00
Timur Iskhakov
d8299ff809 Print full name test
Bug: 65563308

Test: hidl_test

Change-Id: I629a5a7fa708b567591e27bdb39ed5626add4895
2017-09-13 18:00:29 -07:00
Timur Iskhakov
3efd584fe4 Merge "Interface for hidl forward reference test" am: 1b08076ad5 am: 812f779dfe
am: 98e9734797

Change-Id: I878bf4b47073c3c23acf80a226a51cb8415146bc
2017-09-14 00:08:50 +00:00
Zhuoyao Zhang
cf44876032 Merge "Update build for test hal: libhwbinder" am: 754d21772a am: 597f08a47b
am: bf3c5d96c8

Change-Id: Ie421827cb7dd5d9f3b9e3cc25695b4227fd9e3e8
2017-09-14 00:07:31 +00:00
Timur Iskhakov
64c9669fd2 Test HIDL topological reordering
Bug: 65636464

Test: hidl_test
Change-Id: I7eae65c89252bebf865803d24101b08a7088c669
2017-09-13 14:17:29 -07:00
Treehugger Robot
1b08076ad5 Merge "Interface for hidl forward reference test" 2017-09-13 19:59:05 +00:00
Timur Iskhakov
67753ea3d7 Interface for hidl forward reference test
Test proofs that forward reference can now be used.
Test contains trie implementation and some forward reference examples.

Bug: 31827278

Test: hidl_test

Change-Id: I55cdde500baea3e70ebf4466c681ad652b6ff9fd
2017-09-12 17:41:13 -07:00
Zhuoyao Zhang
d2e1850a46 Update build for test hal: libhwbinder
* Use cc_default to extract common build rules.
* Static link android.hardware.tests.libhwbinder@1.0 to the impl lib.

Bug: 65483634
Test: make vts
      vts-tradefed run vts-performance

Change-Id: Ia6fc6593e3f833c1a7de91f817fb684280a8b555
2017-09-12 14:51:52 -07:00
Jaekyun Seok
81104ae5ef Add 'vendor.' prefix to a vendor HAL service name
To prevent property name collisions between properties of system and
vendor, 'vendor.' prefix must be added to a vendor HAL service name.
You can see the details in http://go/treble-sysprop-compatibility.

Test: succeeded building and tested on a walleye device
Bug: 36796459
Change-Id: I4e8fbee791ec917a8f627a1366f4d44ec7e6febc
2017-09-12 08:01:42 +09:00
Jiyong Park
d8a2e2f0d4 Merge "HAL interface libs for testing are now built as test lib" into oc-mr1-dev
am: b0977150b0

Change-Id: Ia844b23838a29b2da0b4278f252c7941fa83ca65
2017-09-07 17:41:14 +00:00
Jiyong Park
9a4b17e3e1 HAL interface libs for testing are now built as test lib
The HAL interfaces for testing were copied to /system/lib[64]/vndk
directory since they are built as cc_library and thus falsely recognized
as members of VNDK, which isn't true.

Build them as cc_test_library so that they are filtered out. To do so,
.hidl_for_test files are added for the test HALs and update-makefiles.sh
were ran.

Bug: 64776708
Test: no android.hardware.tests.*.so file in /system/lib[64]/vndk on
2017 pixel devices

Change-Id: I5314db6cc08a43bccfc4521d4b80b614a91e7e48
2017-09-01 09:54:16 +09:00
Timur Iskhakov
a3b0f1f431 Check array dimenstion order
Bug: 65257916
Test: mma
Change-Id: I5dcd859120800909b6fc4811c5e5a0d2f8790bcd
2017-08-31 15:18:45 -07:00
Zhuoyao Zhang
36cb0a2d99 Move android.hardware.tests.libhwbinder@1.0-impl to system.img
am: d536358066

Change-Id: Ic407842046122563020b00d7df6b0e13d27aab74
2017-08-17 00:10:20 +00:00
Zhuoyao Zhang
d536358066 Move android.hardware.tests.libhwbinder@1.0-impl to system.img
Bug: 64723866
Test: make vts
      vts-tradefed run vts-performance

Change-Id: Ib5e993d98f7fa12dcb2b418a995887b59394c849
2017-08-16 10:21:09 -07:00
Steven Moreland
dfd8287506 Updating all makefiles.
Bug: 64487114
Test: none
Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Merged-In: I2fa89b6661c39859ec4fb62c4bb0a05a35e645f0
Merged-In: Ifdc3c17cb2b85c18b37dac2d03bb5c8935c23180
Change-Id: I170fa1c4fe39f8109b1670db58ef99bb11afc0be
2017-08-14 20:25:09 +00:00
Steven Moreland
271d53d836 Update makefiles for vndk enabled.
am: 5e59402492

Change-Id: I08414d68d5275df82336653cb91765af7235f914
2017-08-09 00:44:39 +00:00
Steven Moreland
5e59402492 Update makefiles for vndk enabled.
Test: none
Bug: 63866913
Merged-In: I29174fdadca2828455ef49f14e53bc95c5238dbb
Change-Id: I29174fdadca2828455ef49f14e53bc95c5238dbb
(cherry picked from commit c716b8c307)
2017-08-08 17:09:10 +09:00
Steven Moreland
4e06dd1aa9 Merge changes from topic 'go-away-static-hidl-java'
am: f4c58cd48c

Change-Id: I3502ad1d51868cd82bbe811bdf2b96ec45ccfbe6
2017-08-04 19:22:05 +00:00
Justin Yun
608d773ef8 Update make file for vndk enabled.
Update the Android.bp generated with hidl-gen.

Test: build with and without BOARD_VNDK_VERSION=current
Bug: 63866913
Change-Id: I1a9db1df49e0f13c5790da2b118ae9ec63ba34a7
2017-08-04 14:12:23 +09:00
TreeHugger Robot
d9b12c13e5 Merge "Update makefiles for vndk enabled." into oc-mr1-dev 2017-08-04 00:52:06 +00:00
Steven Moreland
b5da32c177 Update makefiles.
Removes redundant "java-static" target.

Note, targets aren't removed here which have internal
targets that depend on them.

Bug: 36376126
Test: pass
Change-Id: I830f02e5f219d2d58721132c358d2783c3942eac
2017-08-03 15:25:21 -07:00
Steven Moreland
c716b8c307 Update makefiles for vndk enabled.
Test: none
Bug: 63866913
Change-Id: I29174fdadca2828455ef49f14e53bc95c5238dbb
2017-08-02 18:00:14 -07:00
Tri Vo
f5d136c231 Update Android.bp HIDL makefiles
Allow HAL definition libs to be static.

Bug: 32920003
Bug: 64040096
Test: update-all-google-makefiles.sh
Change-Id: I1483d572bea6799717d1614fb7d52fe225e31104
2017-08-03 00:30:01 +00:00
Steven Moreland
208a586cf8 Update HIDL makefiles.
Allow them to be static.

This is required for a couple of reasons:
- enabling HIDL passthrough in recovery
- enabling VTS tests to be static blobs

Bug: 32920003
Bug: 64040096
Test: update-all-google-makefiles.sh
Merged-In: I1b2401fb273ab80819e3870aa71fe742269674ba
Change-Id: I1b2401fb273ab80819e3870aa71fe742269674ba
(cherry picked from commit 7206708528)
2017-08-02 12:52:41 -07:00
Sundong Ahn
79e801cb18 Change dependency library
am: 94293086f8

Change-Id: I3b024890195dad8fa3435a4ff493adbddb63ef20
2017-08-02 16:56:46 +00:00
Sundong Ahn
94293086f8 Change dependency library
hwbinder.jar will be used instead of framework.jar on build-time, but
on runtime framework.jar will be used.

This is to cut the circular dependency when using configstore from
Android framework.

Bug: 35771640
Test: no test.
Change-Id: I04cab676c91d2ea423f5e2c1b2b9efa15e522f37
2017-08-01 11:24:01 +09:00
Steven Moreland
68a25d22e3 Merge "Update HIDL makefiles."
am: 49dad304a5

Change-Id: I29f1de44312f589ba6e1df9498809cbb31315a2b
2017-07-31 19:33:34 +00:00
Steven Moreland
7206708528 Update HIDL makefiles.
Allow them to be static.

This is required for a couple of reasons:
- enabling HIDL passthrough in recovery
- enabling VTS tests to be static blobs

Bug: 32920003
Bug: 64040096
Test: update-all-google-makefiles.sh
Change-Id: I1b2401fb273ab80819e3870aa71fe742269674ba
2017-07-26 10:14:57 -07:00
Zhuoyao Zhang
9ff0bb218b resolve merge conflicts of 8d92561 to oc-mr1-dev
Test: I solemnly swear I tested this conflict resolution.
2017-07-25 21:14:07 -07:00
Zhuoyao Zhang
2d2b64e241 Move android.hardware.tests.msgq@1.0-impl to system.img
Bug:63704014
Test: make vts
      vts-tradefed run vts -m VtsFmqUnitTest.

Change-Id: I0deb28ffdbd437cc05d9c1efed63e0ba9dc3a048
Merged-In: I0deb28ffdbd437cc05d9c1efed63e0ba9dc3a048
(cherry picked from commit ea35563b79)
(cherry picked from commit 1d42476fdcd631fcf97d2ccf24996c8b7edd7521)
2017-07-25 20:17:03 +00:00
Zhuoyao Zhang
2f7bec8fe4 Move android.hardware.tests.msgq@1.0-impl to system.img
am: ea35563b79

Change-Id: I7adce534ebec348cc0fea8a840cea38e27c73b6c
2017-07-21 20:53:50 +00:00
Zhuoyao Zhang
ea35563b79 Move android.hardware.tests.msgq@1.0-impl to system.img
Bug:63704014
Test: make vts
      vts-tradefed run vts -m VtsFmqUnitTest.

Change-Id: I0deb28ffdbd437cc05d9c1efed63e0ba9dc3a048
2017-07-21 10:53:24 -07:00
Steven Moreland
050dbf98ba Move multithread impl to system.
am: bd10b5aa5a

Change-Id: I6f78d61e3fa13936e57288f34363c8a425ae5cca
2017-07-20 05:21:46 +00:00
Steven Moreland
bd10b5aa5a Move multithread impl to system.
Test: hidl_test passes with linker restrictions in place
Change-Id: Ib860848b1d17073d2b5279d0d390f242864447b4
2017-07-20 03:07:41 +00:00
Steven Moreland
49abbfdd68 Merge "Move all hidl_test dependencies to the system.img"
am: 46bb27e614

Change-Id: Id46ab1835638aec6c98f0b2775774cb4cc0c34dd
2017-07-18 08:50:32 +00:00
Steven Moreland
2f2aabe212 Move all hidl_test dependencies to the system.img
Test: hidl_test passes
Test: build with BOARD_VNDK_VERSION=current
Bug: 63704014
Change-Id: Ia97be8b4d61236adfd964bf8e4fa632d99010b98
2017-07-17 18:36:02 -07:00
Timur Iskhakov
d19838d2c4 Interface for configureRpcThreadpool tests
am: 16a0437ab3

Change-Id: Ie8c58380704d5a007566491e53d415ee5e14bbc1
2017-07-14 20:16:20 +00:00
Timur Iskhakov
16a0437ab3 Interface for configureRpcThreadpool tests
Test: links, compiles
Change-Id: I58996c4eeba5889c73407b1d71f03638b23d73d1
Merged-In: I58996c4eeba5889c73407b1d71f03638b23d73d1
2017-07-13 17:18:51 -07:00
Steven Moreland
44b99959b0 Remove versioning tests interfaces. am: 1cb1e14fae am: 45b2a58130
am: ca4611d6c2

Change-Id: Ie6ba94cf1386eedcd1b53d08f697af83c57f39d6
2017-05-26 19:15:52 +00:00
Steven Moreland
1cb1e14fae Remove versioning tests interfaces.
These are moved to system/tools/hidl/test in
a form that can have build time tests added
and which don't affect checkbuild time by
adding various Java targets.

Test: none
Bug: 38242758
Change-Id: I747619389e667f5660cdc0bf2cccd9df6bbb8eb4
2017-05-26 16:46:59 +00:00
Steven Moreland
e5a50aa9d2 Merge "libhwbinder test: Android.mk -> Android.bp" am: 154040c0ca am: e7d4e66030
am: ce443e0b23

Change-Id: I2b63cd362403db78159f05f5dbf4a13d7a0d7d79
2017-05-25 21:03:20 +00:00
Steven Moreland
63a733ab33 libhwbinder test: Android.mk -> Android.bp
Test: links

Change-Id: Iaaa27cb0f398ee4b9a273916454f3110ddee0e3b
2017-05-24 14:39:57 -07:00
Steven Moreland
f203167814 Update makefiles. (2/2)
am: 76cfb84140

Change-Id: I24d21438a5b2f447d2160929c6ff6e17b2b66820
2017-05-22 17:15:20 +00:00
Steven Moreland
67b9ae7d9c Merge "Update makefiles." am: 9119d4ccd1 am: 242b2288d7
am: c6da54569f

Change-Id: Ib7f7a9cdb64985d545443edac5bb8e9c169fc592
2017-05-20 00:19:40 +00:00
Steven Moreland
76cfb84140 Update makefiles. (2/2)
Adds default configuration for all hals.

Bug: 38415912
Test: pass
Change-Id: Idd1f3a2b7b16ad956d31784a513e93a066cdd02e
2017-05-19 15:54:03 -07:00
Steven Moreland
e4d318948a Update makefiles.
Adds default configuration to all hals.

Test: pass
Merged-In: Icdf6b56df82c4b7b7de815e7febea9a07ab96856
Change-Id: Icdf6b56df82c4b7b7de815e7febea9a07ab96856
2017-05-19 15:53:53 -07:00
Steven Moreland
06c85d986a Update makefiles.
Adds default configuration to all hals.

Test: pass
Change-Id: Icdf6b56df82c4b7b7de815e7febea9a07ab96856
2017-05-18 16:14:16 -07:00
Howard Chen
82ddb247b2 Add HIDL_FETCH_IScheduleTest declaration
Fix the bug that makes the registerAsServer fail.
sp<IScheduleTest> server =
	IScheduleTest::getService(serviceName, true);
status_t status = server->registerAsService(serviceName);

Bug:38099333
Test: oc-dev on pixel sailfish with a vts test case
  "libhwbinder_latency -i 1"
Change-Id: I892835a25ef7df56a6424da41c0fc477b3a532d8
2017-05-16 16:22:05 +00:00
Howard Chen
35ae446548 Add IScheduleTest for VTS libhwbinder scheduler test
Add IScheduleTest.hal:
    send(cfg, callerSta)
cfg: 1 for verbose output
caller_status:  (caller_rt_priority <<16 )| caller_cpu

with the return value defined as:
((1 if no priority inheritance)<<16) | (1 if no cpu sync)
The implementation is in ScheduleTest.cpp

Bug:36705188
Test: sailfish/prebuilt kernel/oc-dev with the libhwbinder_latency
  vts test case
Merged-In: Ie2a837c8d0d4fa95c6fd0ebd50e76412cb808df8

Change-Id: Ic0498bc2b036cedced906963bb8e489dcca47a1a
2017-05-16 14:58:00 +08:00
Steven Moreland
a32ebce372 Update makefiles for c++-sources and c++-headers. (2/2)
am: bc71124120

Change-Id: Icf36068a4d863a8520854c7a83e51f960c188e12
2017-05-11 00:48:55 +00:00
Steven Moreland
4be51a8512 Merge changes from topic 'fix-hidl-generate' into oc-dev
* changes:
  Update makefiles for c++-sources and c++-headers.
  Update makefiles for c++-sources and c++-headers. (2/2)
2017-05-10 20:02:40 +00:00
Steven Moreland
8716f3063e Update makefiles for c++-sources and c++-headers.
Test: pass
Bug: 38174080
Merged-In: I683455736eed35e6ced24e2763c2bdb5fb6c9601
Change-Id: I683455736eed35e6ced24e2763c2bdb5fb6c9601
2017-05-09 19:58:45 -07:00
Steven Moreland
bc71124120 Update makefiles for c++-sources and c++-headers. (2/2)
Test: pass
Bug: 38174080
Change-Id: Icad451f9f9ad5f46412356a4171a8a1222f8e545
2017-05-09 19:58:43 -07:00
Steven Moreland
8e89a43590 Update makefiles for c++-sources and c++-headers. am: cb360c60d8 am: 4bd4e7fb3b
am: 127b116fe5

Change-Id: I3a2aa76acef0f0d1455bfad775e87e8089d357e8
2017-05-10 02:58:00 +00:00
PO HUNG CHEN
9a520b0524 Merge "Bugfix: Add HIDL_FETCH_IScheduleTest declaration" into oc-dev
am: c365952316

Change-Id: If6399162d868c7498ca6e4a5d9453b4425ab77cc
2017-05-10 02:42:02 +00:00
Steven Moreland
cb360c60d8 Update makefiles for c++-sources and c++-headers.
Test: pass
Bug: 38174080
Change-Id: I683455736eed35e6ced24e2763c2bdb5fb6c9601
2017-05-09 14:34:19 -07:00
Howard Chen
b71db8f2b4 Bugfix: Add HIDL_FETCH_IScheduleTest declaration
Fix the bug that makes the registerAsServer fails.
sp<IScheduleTest> server =
	IScheduleTest::getService(serviceName, true);
status_t status = server->registerAsService(serviceName);

Bug:38099333
Test: oc-dev on pixel sailfish with a vts test case
  "libhwbinder_latency -i 1"
Change-Id: I892835a25ef7df56a6424da41c0fc477b3a532d8
2017-05-08 15:36:11 +08:00
Steven Moreland
5c63b11f76 Remove redundant dependencies
android.hidl.base@1.0 and android.hidl.manager@1.0 are built into libhidltransport.

Test: links
Bug: 33276472
Merged-In: I08aaad80f7e2fc262aa3a8b66fe932e8133a928d
Change-Id: I08aaad80f7e2fc262aa3a8b66fe932e8133a928d
2017-05-02 15:29:30 -07:00
Steven Moreland
f90189a79f Merge "Remove redundant dependencies" am: 62769b7196 am: 170e2e85a2
am: 5fba1db1d2

Change-Id: I661fff75d140b4359af055a0f08f08ef33c889c3
2017-05-01 23:37:04 +00:00
Steven Moreland
ee1d248ae2 Remove redundant dependencies
android.hidl.base@1.0 and android.hidlmanager@1.0 are built into libhidltransport.

Test: links
Bug: 33276472
Change-Id: I424371932af129bba9d58dcf8652c64297f35f05
2017-05-01 09:47:58 -07:00
Howard Chen
812f5d3101 Add IScheduleTest for VTS libhwbinder scheduler test
Add IScheduleTest.hal:
    send(cfg, callerSta)
cfg: 1 for verbose output
caller_status:  (caller_rt_priority <<16 )| caller_cpu

with the return value defined as:
((1 if no priority inheritance)<<16) | (1 if no cpu sync)
The implementation is in ScheduleTest.cpp

Bug:36705188
Test: sailfish/prebuilt kernel/oc-dev with the libhwbinder_latency
  vts test case
Change-Id: Ie2a837c8d0d4fa95c6fd0ebd50e76412cb808df8
2017-04-17 14:34:34 +08:00
Andreas Huber
6fa374ad30 Changed the naming scheme for Treble java libraries (both static and dynamic)
android.hardware.foo@1.0-java => android.hardware.foo-V1.0-java

Bug: 37207894
Test: make
Change-Id: I177f4cfd42f635aaf096107af8309d1a82ed41c0
Merged-In: I8b91881dfaf507c0d852d56ebbb53ff0987e5a34
2017-04-13 15:23:46 -07:00
Andreas Huber
6733baff6c Changed the naming scheme for Treble java libraries (both static and dynamic)
android.hardware.foo@1.0-java => android.hardware.foo-V1.0-java

Bug: 37207894
Test: make
Change-Id: I177f4cfd42f635aaf096107af8309d1a82ed41c0
Merged-In: I8b91881dfaf507c0d852d56ebbb53ff0987e5a34
2017-04-13 15:16:27 -07:00
Treehugger Robot
12d911204f Merge "Mark hidl test libs as vendor." 2017-04-12 23:07:17 +00:00
Steven Moreland
17f0c0dde7 Merge changes from topic 'hidl-vendor-available' into oc-dev
* changes:
  Update makefiles (2/2).
  Update makefiles.
2017-04-12 22:13:58 +00:00
Steven Moreland
d52e0ff21a Mark hidl test libs as vendor.
They must be on the vendor partition for hidl_test to be able to link to
them when the VNDK is in place.

Test: hidl_test
Bug: 33241851
(cherry picked from commit 00556e0a11)
Merged-In: I23c9e0674aaf33602bc9fde0515eb2f87ce5c60c
Change-Id: I23c9e0674aaf33602bc9fde0515eb2f87ce5c60c
2017-04-12 13:58:10 -07:00
Steven Moreland
00556e0a11 Mark hidl test libs as vendor.
They must be on the vendor partition for hidl_test to be able to link to
them when the VNDK is in place.

Test: hidl_test
Bug: 33241851
Change-Id: I23c9e0674aaf33602bc9fde0515eb2f87ce5c60c
2017-04-11 17:56:47 -07:00
Steven Moreland
0dd5ba23fb Update makefiles.
Test: pass
Change-Id: I5cf42c8ff1e11207394e4852ba0bd03e4e3b7d2e
2017-04-11 16:41:07 -07:00
Steven Moreland
3b36a83a2e Update makefiles (2/2).
Test: pass
Change-Id: Ic7e6289c7b69785491708ce0acbb657f4c704229
2017-04-11 09:58:03 -07:00
Steven Moreland
b2799c370f Update makefiles.
Test: pass
Change-Id: I5cf42c8ff1e11207394e4852ba0bd03e4e3b7d2e
2017-04-11 09:57:40 -07:00
Andreas Huber
8410871493 Empty interface IQuux which is completely unrelated to IBase and IBaz.
Used to verify that it's not possible to obtain an IQuux interface from an
IBase/IBaz binder, i.e. IHwBinder.asInterface(...) properly respects the
interfaceChain.

Bug: 36749201
Test: hidl_test_java
Change-Id: I84419e78db22acdfcc7d9972d22d139641469bde
2017-04-05 12:46:13 -07:00
Andreas Huber
9fff7b862b Empty interface IQuux which is completely unrelated to IBase and IBaz.
Used to verify that it's not possible to obtain an IQuux interface from an
IBase/IBaz binder, i.e. IHwBinder.asInterface(...) properly respects the
interfaceChain.

Bug: 36749201
Test: hidl_test_java
Change-Id: I84419e78db22acdfcc7d9972d22d139641469bde
2017-04-04 14:43:13 -07:00
Yifan Hong
80471b04b0 Test for getHashChain() in IBase.
Each interface has a getHashChain() method that
returns the hash of all .hal files from the rtti
of the interface up to IBase.

Test: hidl_test

Bug: 36602587
Change-Id: I53a79ba69edd109f169c37dbe0fd10e302eb929c
2017-04-03 12:23:21 -07:00
Yifan Hong
604e8f0da2 Test for getHashChain() in IBase.
Each interface has a getHashChain() method that
returns the hash of all .hal files from the rtti
of the interface up to IBase.

Test: hidl_test

Bug: 36602587
Change-Id: I53a79ba69edd109f169c37dbe0fd10e302eb929c
2017-03-30 17:34:03 -07:00
Andreas Huber
675ae49ab1 Convert all comments into "doxygen-ready" comments.
Bug: 36453077
Test: make
Change-Id: Ic77394d4d2e1ccedba3a28230d870c5d6108bd40
2017-03-28 16:14:43 -07:00
Andreas Huber
3e4acb8b3a Convert all comments into "doxygen-ready" comments.
Bug: 36453077
Test: make
Change-Id: Ic77394d4d2e1ccedba3a28230d870c5d6108bd40
2017-03-28 16:10:42 -07:00
Steven Moreland
561b602a99 Update makefiles for hwtypes.h
Test: pass
Change-Id: I8e17eb8fec5d2f04c526476a866c8dd54ccb556c
2017-03-28 15:18:20 +00:00
Steven Moreland
53b21566bc Update makefiles. am: e90c31f125 am: f11981de68
am: 103bada0e1

Change-Id: Ibe6eeeacab5660a8cf70d59dd9a4864d6f70ab80
2017-03-27 17:51:28 +00:00
Steven Moreland
e90c31f125 Update makefiles.
Test: pass
Change-Id: I925baccbe51a32b7b7f3f66cf2918d017ee6b039
2017-03-24 21:50:45 -07:00
Hridya Valsaraju
3eebe248e5 Merge "use toString instead of to_string" am: 6a73f61b96 am: a1b886fd90
am: 35937ab9fa

Change-Id: I0cb0cbff94b206655061c078848c0ff95147fcfc
2017-03-22 23:04:42 +00:00
Treehugger Robot
6a73f61b96 Merge "use toString instead of to_string" 2017-03-22 22:49:38 +00:00
Hridya Valsaraju
1b019d5a6c use toString instead of to_string
Bug: 35703683
Test: hidl_test_java passes

Change-Id: Ib7d6807f6b9ddcd7b0271b17a0a52be0ee07ec6c
2017-03-22 13:19:54 -07:00
Steven Moreland
2628f37ba0 Versioning, add additional package import. am: a233c182be am: f0dd7270f1
am: 3bb7c80e1d

Change-Id: I41d46e089aca2ef875ce28a5bfad3ab3745184ac
2017-03-20 17:20:41 +00:00
Steven Moreland
a233c182be Versioning, add additional package import.
Added versioning@2.4. This tests the same as 2.2->2.3, but also repros
an issue in hidl-gen where triple inheritance isn't allowed.

Test: minor version inheritance doesn't fail, triple inheritance works
Bug: 36162559
Change-Id: Id5518621cd068b1b623f30f6f6762a1bf8ae6a80
2017-03-20 14:15:46 +00:00
Steven Moreland
54cc198022 update-makefiles for transisitive dependencies
Test: pass
Bug: 36162559
Change-Id: I4f5fddaef9811f0da1d69fa26a5d34830a1a9634
2017-03-20 07:13:46 -07:00
Hridya Valsaraju
af81f21044 Merge "Move FMQ benchmark/test services to hardware/interfaces" am: 178250d254 am: c35f1e7bc1
am: add0d3c8b8

Change-Id: I002bb4119971877061921bb260238c6dc2568fca
2017-03-14 22:22:52 +00:00
Hridya Valsaraju
171603eaa9 Move FMQ benchmark/test services to hardware/interfaces
Bug: 32284445
Test: Built and ran FMQ benchmarks

Change-Id: Ia6bacf21d276b55e4e590dc96f348464f2098992
2017-03-13 23:31:04 +00:00
Steven Moreland
b28099785a Add hidl_default and make modules use hidl_default. am: 691a455b9f am: 7c9f5c35d8
am: a6de4ca892

Change-Id: Ie4a219330792a194bef4a983b706c5f3191761a7
2017-03-09 02:09:52 +00:00
Steven Moreland
f53a334871 IBaz: remove unused function am: dc611e5df9 am: 1035d17739
am: 43fa10b2e6

Change-Id: I0033c817c77fb8012019ff75aa2a3140f9ec48a9
2017-03-09 02:09:49 +00:00
Steven Moreland
691a455b9f Add hidl_default and make modules use hidl_default.
find hardware/interfaces -type f -not -path "*/.git/*" \
-exec sed -i -e '/cc_[A-Za-z_]\+/ { N; s/$/\n    defaults:
\["hidl_defaults"\],/ }' {} \;
./hardware/interfaces/update-makefiles.sh

Test: no warnings
Bug: 35840847
Change-Id: I468b76893bf3f4b62ad610d1d9603bcb8797a702
2017-03-08 16:22:00 -08:00
Steven Moreland
dc611e5df9 IBaz: remove unused function
Test: pass
Change-Id: I5bc806b4780cfadd9f0c35df60c43203c90d7244
2017-03-08 16:22:00 -08:00
Hridya Valsaraju
2394c4830a Merge "Move FMQ tests to hardware/interfaces" am: 96b3cce92c am: 35b5786cd7
am: 56fbe8aef2

Change-Id: Ic97ea0e01ff430806cc96cf89c4205b4bb044778
2017-03-08 00:11:57 +00:00
Hridya Valsaraju
8a7086296c Move FMQ tests to hardware/interfaces
Test: FMQ unit tests pass
Bug: 32284445

Change-Id: I1daf563560d12fc7a4433ae98876331c37509980
2017-03-07 09:02:23 -08:00
Hridya Valsaraju
d59b0cab70 Merge "Revert "Revert "Move android.hardware.benchmarks into android.hardware.tests""" am: 38f2a8495f am: ca72971fea
am: da8bf19fe4

Change-Id: Iebe5c0d1ccb3d0185ae5b686ec826f65b83494b2
2017-03-07 00:26:04 +00:00
Hridya Valsaraju
0047809804 Revert "Revert "Move android.hardware.benchmarks into android.hardware.tests""
Test: built and ran FMQ benchmarks

This reverts commit 8b34b1a547.

Change-Id: I7d8884b9de97980b5bdb7a4355a61b00bbd396b4
2017-03-03 14:10:29 -08:00
Greg Hartman
188df08931 Merge "Revert "Move android.hardware.benchmarks into android.hardware.tests"" am: b59f873ab9 am: 19de6f7815
am: a25c53a2a4

Change-Id: I3b1a764c1e0c818685cbf09b4e88bafc459c63ac
2017-03-02 23:47:23 +00:00
Greg Hartman
b59f873ab9 Merge "Revert "Move android.hardware.benchmarks into android.hardware.tests"" 2017-03-02 23:40:02 +00:00
Michael Rosenfeld
8b34b1a547 Revert "Move android.hardware.benchmarks into android.hardware.tests"
This reverts commit c8f7d73720.

Change-Id: I957cd686468aa618014a95c0510b162956df9bf7
2017-03-02 22:28:23 +00:00
Hridya Valsaraju
3a3dc8fef4 Merge "Move android.hardware.benchmarks into android.hardware.tests" am: 533ab025d0 am: 36ec5ebe3a
am: 9317dca20b

Change-Id: I74acdcd729d837cd129c59a70625aa91e8514983
2017-03-02 22:23:27 +00:00
Treehugger Robot
533ab025d0 Merge "Move android.hardware.benchmarks into android.hardware.tests" 2017-03-02 22:11:06 +00:00
Hridya Valsaraju
48c9837a55 Merge "Move baz default implementation to hardware/interfaces" am: b541affafb am: c990e2e15f
am: 7e7d3758d1

Change-Id: I6b8c250747d938d7ca56cd87bf89291c3a61f87f
2017-02-28 21:51:39 +00:00
Treehugger Robot
b541affafb Merge "Move baz default implementation to hardware/interfaces" 2017-02-28 21:10:32 +00:00
Hridya Valsaraju
c8f7d73720 Move android.hardware.benchmarks into android.hardware.tests
Test: Ran FMQ benchmarks.

Bug: 35015612
Change-Id: Ic25e51051779b296ada5f02bc0c3258bff507ca3
2017-02-28 12:41:25 -08:00
Yifan Hong
2c5e21c69c Merge "Add tests for .equals and toString" am: 7128746a9f am: cc51d3b2ae
am: 77c34e94c9

Change-Id: If4ba94ff09f9160727befc47f09eaed0d7a8af64
2017-02-27 18:56:13 +00:00
Treehugger Robot
7128746a9f Merge "Add tests for .equals and toString" 2017-02-27 18:43:28 +00:00
Steven Moreland
1daad90b81 Remove viral dependency on libhwbinder. am: d28a3dce40 am: 444d759920
am: 5c605c8add

Change-Id: I54d6e5a0b38ef9eb507748fd38a8c508e0eb1948
2017-02-25 02:55:43 +00:00
Hridya Valsaraju
6cf95f3710 Move baz default implementation to hardware/interfaces
Test: hidl_test and hidl_java_test passes

Change-Id: Iaacfc3f203368ca674cbaddc6cdf06ddb8e34500
2017-02-24 16:10:25 -08:00
Steven Moreland
7e73d5b908 Remove viral dependency on libhwbinder. (2/2)
find hardware/interfaces -name Android.mk -exec sed -i -e '/libhwbinder
\\/d' {} \;
find hardware/interfaces -name Android.bp -exec sed -i -e
'/"libhwbinder"/d' {} \;
./hardware/interfaces/update-makefiles.sh

Note, automotive has some actual dependencies on libhwbinder, filed
b/35758626 for this.

Test: everything links
Test: (sanity) booted marlin on internal master with these changes
Bug: 35710429
Change-Id: I6d0726c8130d00684b978efbdd48e3ae396f12e5
2017-02-24 12:18:01 -08:00
Steven Moreland
d28a3dce40 Remove viral dependency on libhwbinder.
find hardware/interfaces -name Android.mk -exec sed -i -e '/libhwbinder
\\/d' {} \;
find hardware/interfaces -name Android.bp -exec sed -i -e
'/"libhwbinder"/d' {} \;
./hardware/interfaces/update-makefiles.sh

Test: everything links
Test: (sanity) booted marlin on internal master with these changes
Bug: 35710429
Change-Id: I6b0b5ae318422b7a9be17a19a79e039ffc0f9272
2017-02-24 12:01:06 -08:00
Yifan Hong
4093a44585 Add tests for .equals and toString
Test: hidl_test
Test: hidl_test_java

Bug: 32834072
Bug: 33459772
Change-Id: Ic1a87529fe5f8c12f7bfbdc2fa668e66922e075f
2017-02-22 16:09:17 -08:00
Tri Vo
e8d2656322 Update makefiles. am: 69fa1faddd am: 78cefb9454
am: 6dd991cc9a

Change-Id: I1f26b2e13faa92dbaf4f39d61a09835bcd4bf139
2017-02-22 20:38:03 +00:00
Tri Vo
69fa1faddd Update makefiles.
Test: mmma hardware/interfaces
Change-Id: I501524fa3fbbaed9b71e5b9c3bbc8aa3c8c25896
2017-02-22 10:46:47 -08:00
Yifan Hong
8f44545bdc Update tests for enforcing minor version upgrade. am: 6283d249f9 am: 811652124d am: 10a766ff2c
am: a056eaeb17

Change-Id: Ie4e38bbdd3b4d824d3e1afeb0a8d7a37c9acff19
2017-02-16 18:49:07 +00:00
Yifan Hong
6283d249f9 Update tests for enforcing minor version upgrade.
Test: ./hardware/interfaces/update-makefiles.sh
Test: mma

Bug: 28825532

Change-Id: I1ae86f597f184d75ad5476b248e03248346b0c33
2017-02-16 06:11:39 +00:00
Steven Moreland
0734fd23ba Merge "update-makefiles.sh" am: dcec84e96c am: 1eed5f2d5d am: 238c76ee22
am: 67188b98a8

Change-Id: I781587bacb5fb165d54d42bf7c8a87db7ef322f1
2017-02-16 06:03:19 +00:00
Steven Moreland
dcec84e96c Merge "update-makefiles.sh" 2017-02-16 05:48:02 +00:00
Hridya Valsaraju
b501ccdff8 Merge "Modify method to get MQDescriptor for unsynchronized FMQ." am: 02f3f834fc am: f869630d3b am: 02bcec2054
am: a7c7253bf3

Change-Id: I8c092e5b2d40d2a0ee0bf511c44b2587f6b6d2e6
2017-02-16 02:10:31 +00:00
Treehugger Robot
02f3f834fc Merge "Modify method to get MQDescriptor for unsynchronized FMQ." 2017-02-16 01:48:07 +00:00
Steven Moreland
21a1c58b6c Move example extensions to test folder.
Fixes: 34969978
Test: hal registers itself and works.

Change-Id: I9e4795b1acbabceed017c469b89baea7e529308a
2017-02-15 14:25:00 -08:00
Steven Moreland
821b01c9fe update-makefiles.sh
There have been some changes to the way hidl-gen generates these and
some CLs got out of sync with hidl-gen.

Test: pass
Change-Id: I33c573499d5dd37de447902fd93929b80a5df371
2017-02-15 10:59:23 -08:00
Hridya Valsaraju
c3db9c8142 Modify method to get MQDescriptor for unsynchronized FMQ.
The modified method adds a new parameter specifying
if a new unsynchronized FMQ needs to be set up by the server
or if it is to return an MQDescriptor to
an unsynchronized FMQ that has already been configured
by the server(if one exists)

Bug: 35319190
Test: FMQ unit tests
Change-Id: I64a5b356a2761faaeeea6fdd2c3a7da9b60f0016
2017-02-13 15:50:40 -08:00
Steven Moreland
46c0b94992 Move hidl shims to the vendor partition.
We need google shims on the vendor partition because they are providing
an implementation of a vendor defined interface. They were written by
google just as a courtesy/to make the transition easier. They're
basically a set for vendors to assemble their hal implementations
from.

Bug: 34135607
Test: marlin persist.hal.binderization on/off

Merged-In: I3f86c77c147514fe470f08088a66de312ae32d4e
Change-Id: I3f86c77c147514fe470f08088a66de312ae32d4e
2017-02-13 23:14:38 +00:00
Steven Moreland
ff4224809f Move hidl shims to the vendor partition.
We need google shims on the vendor partition because they are providing
an implementation of a vendor defined interface. They were written by
google just as a courtesy/to make the transition easier. They're
basically a set for vendors to assemble their hal implementations
from.

Bug: 34135607
Test: marlin persist.hal.binderization on/off
Change-Id: I3f86c77c147514fe470f08088a66de312ae32d4e
2017-02-13 15:03:33 -08:00
Yifan Hong
87f44a881b Merge "Add tests for minor version upgrade enforcement." am: ea8ff054fa am: af52b48490 am: 2e14b7cc0f
am: 982f85242c

Change-Id: Ie391c983761cd540775abe2e2d72feeeaa2ec5de
2017-02-10 23:47:13 +00:00
Yifan Hong
ea8ff054fa Merge "Add tests for minor version upgrade enforcement." 2017-02-10 23:38:02 +00:00
Tri Vo
4ce38bc27f Use filegroup as genrule srcs. am: 06da29ffae am: 5b43e2caa8 am: 831bfd746c
am: 6924f25a61

Change-Id: Iffa108b900ecbd2800090b5b1cdfc4fc65f63f3c
2017-02-10 02:36:00 +00:00
Yifan Hong
4650ce9d25 Add tests for minor version upgrade enforcement.
Test: compiles
Test: add folder test/versioning/2.0 will make update-makefiles.sh to
fail.
Test: removing @2.3::IBar will let update-makefiles.sh to pass.
Test: Change @2.3::IBar to extend from @2.2::IFoo will let
update-makefiles.sh to fail.

Bug: 28825532
Change-Id: Iad1138b784505c903ab1049f08f6c07c38b777e1
2017-02-09 18:24:18 -08:00
Tri Vo
06da29ffae Use filegroup as genrule srcs.
Test: mmma hardware/interfaces -j64
Change-Id: If282ed5f4a87045d169fcea7ad648b046a5f1cfb
2017-02-10 02:18:07 +00:00
Andreas Huber
c409e30da7 Updated makefiles am: 0574bacb2a am: f9c87639bf am: bf7b779b40
am: 238660c10a

Change-Id: I1600e1a693462fb99b684381860fa788867f45cf
2017-02-10 01:14:57 +00:00
Andreas Huber
0574bacb2a Updated makefiles
Java intermediates are now created in the common rather than the device-
specific generated sources subdirectory.

Bug: 33842609
Test: make
Change-Id: I16af4cd19bf0b24baa0ad9ebfdb86b4d959c8672
2017-02-09 16:56:56 -08:00
Tri Vo
bd397ba5e1 Merge "Remove vts driver/profiler build rules." am: 0f7a0678af am: 3b5f6dad56 am: 468446f91b
am: e9cf6ba378

Change-Id: I7e2fba48c44cdbdb6d87e6d54446986889be26cf
2017-02-08 01:05:09 +00:00
Tri Vo
ac9f1c02f3 Remove vts driver/profiler build rules.
Generate filegroups for .hal files so that driver/profiler build rules
can migrate to another project.

Bug: 34893894
Test: mmma hardware/interfaces -j32
Change-Id: Iefc98a6df16706fbb798bc32405fe8ff0c3de450
2017-02-06 13:54:41 -08:00
Steven Moreland
66816de87f Remove useless Android.mk files.
Test: none
Change-Id: I99f4d3e5b943742009e366b13bee2c32e38a3fba
2017-01-18 11:49:08 -08:00
Yifan Hong
cad2f77b0e Merge "Add test for type resolution." am: 5835d9ea59 am: 168bb896b7 am: 6cc9f50bd3
am: 63a36d7b62

Change-Id: I0477b4dc3e782752a556003ddaced227d2271b06
2017-01-17 21:12:01 +00:00
Yifan Hong
5835d9ea59 Merge "Add test for type resolution." 2017-01-17 21:03:05 +00:00
Martijn Coenen
4226670424 Merge "Testing struct that has vector of other struct" am: 0bb0ba5f79 am: a69c3034fa am: dabf160073
am: 98d537ec95

Change-Id: Ia384675237edd335e117991607e1a39f6f46dd74
2017-01-17 06:50:54 +00:00
Martijn Coenen
0bb0ba5f79 Merge "Testing struct that has vector of other struct" 2017-01-16 14:48:11 +00:00