Commit graph

85 commits

Author SHA1 Message Date
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
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
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
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
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
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
67b9ae7d9c Merge "Update makefiles." am: 9119d4ccd1 am: 242b2288d7
am: c6da54569f

Change-Id: Ib7f7a9cdb64985d545443edac5bb8e9c169fc592
2017-05-20 00:19:40 +00: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
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
Steven Moreland
0dd5ba23fb Update makefiles.
Test: pass
Change-Id: I5cf42c8ff1e11207394e4852ba0bd03e4e3b7d2e
2017-04-11 16:41:07 -07:00
Steven Moreland
b2799c370f Update makefiles.
Test: pass
Change-Id: I5cf42c8ff1e11207394e4852ba0bd03e4e3b7d2e
2017-04-11 09:57:40 -07: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
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
1daad90b81 Remove viral dependency on libhwbinder. am: d28a3dce40 am: 444d759920
am: 5c605c8add

Change-Id: I54d6e5a0b38ef9eb507748fd38a8c508e0eb1948
2017-02-25 02:55:43 +00: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
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
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
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
7c8d9bbaf1 Revert "move VTS HIDL HAL tests to the corresponding interface directories"
This reverts commit ec7746fa80.

Test: no test
Merged-In: I9ec4493403d71419df99fe9761211eab057cdb0a
Change-Id: I39f2acaa5ee376b90bcddd0891ac6f309cb40a2b
2017-01-14 00:20:11 +00:00
Steven Moreland
96232e327f Revert "Revert "move VTS HIDL HAL tests to the corresponding interface directories""
This reverts commit 070e8d2116.

Change-Id: I66dd4e6cf875e39e58b0d91724a603b37d32c0ac
2017-01-14 00:00:26 +00:00
Ruchi Kandoi
070e8d2116 Revert "move VTS HIDL HAL tests to the corresponding interface directories"
Test: No
This reverts commit ec7746fa80.

Change-Id: I9ec4493403d71419df99fe9761211eab057cdb0a
2017-01-13 15:17:32 -08:00
Ruchi Kandoi
aeb3de7b3f Merge changes from topic 'port-nfc-vts-AOSP'
* changes:
  Fix VTS paths on 32-bit target
  Remove obsolete references to IPCThreadState/ProcessState.
  Update Android.bp of Nfc with make rule for profiler.
  Use lowercase booleans in VTS test configs.
  Update to use the correct logging library.
  Update coverage configs with new format.
  Update NFC VTS configs to reflect new source paths
  increase the timeouts to 10mins for nfc target-side tests
  enable profiling directly from AndroidTest.xml
  NFC: vts: Update VTS driver files as per HAL changes
  NFC: Add target-side VTS tests for NFC
  use svc nfc enable/disable which is always the same.
  move VTS HIDL HAL tests to the corresponding interface directories
  Build target-side NFC test with coverage.
  Remove -DENABLE_TREBLE from vts test LOCAL_CFLAGS.
  Nfc: Split libhidl into base and transport.
  NFC: Update vts files to include the Annotations.
  NFC HAL target-side test (template)
  Update vts files for nfc hidl file style change.
  VTS driver build target for NFC 1.0
  add nfc vts files and vts profiler build rule
2017-01-12 23:13:44 +00:00
Keun Soo Yim
ec7746fa80 move VTS HIDL HAL tests to the corresponding interface directories
Bug: 32783461
Test: vts-tradefed; run vts-hal-hidl
Change-Id: Iead44eaf65dcd4de2286267467c4a4a322a88205
(cherry picked from commit 8a36c0b01c)
2017-01-12 11:02:22 -08:00
Yifan Hong
4bc69c918f Bp/nFoo -> Bp/nHwFoo
Bug: 33554989
Test: hidl_test
Change-Id: I748181e9eaf5b78318054b9fd99ac1a43d00498a
2017-01-11 13:04:15 -08:00
Yifan Hong
10ac9b44f5 Bp/n/sFoo -> Bp/n/sHwFoo
Bug: 33554989
Test: hidl_test
Change-Id: I748181e9eaf5b78318054b9fd99ac1a43d00498a
2017-01-10 16:01:46 -08:00
Yifan Hong
b85d8763c7 Update makefiles for Java package path.
use V1_0 instead of 1.0.

Bug: 33554192

Test: hidl_test_java
Change-Id: Ic2d95265df10914a60a5bb743d75e839948838c3
2016-12-13 18:06:24 -08:00
Yifan Hong
f35ee3b192 Revert "Revert "Update makefiles for Java package path.""
This reverts commit a8789f27cb.

Change-Id: I69980b580a556188ba868bb096ae1590b01759f5
2016-12-13 22:20:16 +00:00