Commit graph

295 commits

Author SHA1 Message Date
TreeHugger Robot
8f56a378bf Merge "Move android.hardware.tests.libhwbinder@1.0-impl to system.img" into oc-mr1-dev 2017-10-04 13:41:00 +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
Zhuoyao Zhang
74e087bb1d Move android.hardware.tests.libhwbinder@1.0-impl to system.img
Bug: 64723866
Test: make vts
      vts-tradefed run vts-performance

Merged-In: Ib5e993d98f7fa12dcb2b418a995887b59394c849
Change-Id: Ib5e993d98f7fa12dcb2b418a995887b59394c849
2017-09-13 19:32:54 +09: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
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
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
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
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