Commit graph

49 commits

Author SHA1 Message Date
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
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
Treehugger Robot
cb5989d239 Merge "Bp/n/sFoo -> Bp/n/sHwFoo" 2017-01-12 01:50:58 +00:00
TreeHugger Robot
a8d358fb63 Merge changes from topic 'bphwfoo'
* changes:
  Bp/nFoo -> Bp/nHwFoo.
  Bp/nFoo -> Bp/nHwFoo
2017-01-11 23:43:16 +00:00
Yifan Hong
4bc69c918f Bp/nFoo -> Bp/nHwFoo
Bug: 33554989
Test: hidl_test
Change-Id: I748181e9eaf5b78318054b9fd99ac1a43d00498a
2017-01-11 13:04:15 -08:00
Mark Salyzyn
5ec14ad8dd Merge "liblog: use log/log.h when utilizing ALOG macros" am: 818ffb15a6 am: ca5117d1f3 am: 7c3240795a
am: d4acfd7503

Change-Id: I477c45fec225f4712051b2ff42b6f55614403531
2017-01-11 15:57:46 +00: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
Mark Salyzyn
a4842ace39 liblog: use log/log.h when utilizing ALOG macros
Test: compile
Bug: 30465923
Change-Id: I67046a75be057e7905570748a1ed6bfd03c0e1c8
2017-01-10 15:02:14 -08:00
Martijn Coenen
ddfd2b832d Callback elision for HIDL interfaces. am: e8b0161713 am: 04bd96f989 am: c8a4f398c2
am: a5cb4f042f

Change-Id: I32cb28fb4acc7d69059b8dd3e80946e2e2963b9c
2017-01-05 10:04:23 +00:00
Martijn Coenen
e8b0161713 Callback elision for HIDL interfaces.
Test: mma, hidl_test
Bug: 31380743
Change-Id: Ic5390d49a9493d1180bdd8a15bc47e891637890e
2017-01-05 08:48:23 +01: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
Yifan Hong
a8789f27cb Revert "Update makefiles for Java package path."
This reverts commit ab0792ccdc.

Change-Id: I47fc272d9fa8875e3d7ccb10cb748c738fbf8135
2016-12-13 22:18:34 +00:00
Yifan Hong
ab0792ccdc 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 11:32:56 -08:00
Yifan Hong
e19e582bd5 Update makefiles for hidlizing IBase.
A new dependency android.hidl.base@1.0 is added for
all projects.

Also updated Android.mk for NFC hal (for java constants)

Test: mma

Change-Id: Ia70d0eb0d74de06475a339698386d383d491a43a
2016-12-03 01:08:59 -08:00
Yifan Hong
501839495f Update makefiles for hidlizing IBase.
A new dependency android.hidl.base@1.0 is added for
all projects.

Test: mma

Change-Id: Ia70d0eb0d74de06475a339698386d383d491a43a
2016-12-03 01:01:14 -08:00
Yifan Hong
15a9614dcd Merge "Update to use the correct library for logging." am: f5e1ac67ed am: 34d006ee9c am: fb89d1237d
am: 6cb0ee580a

Change-Id: I27419afa6ff8ebda825e474d9cee242a29a31f53
2016-11-30 20:59:57 +00:00
Yifan Hong
0c4c7a30c2 Update to use the correct library for logging.
Generates: b/33193497
Test: mma
Change-Id: Ib8bfc4d2f1d68947099e4756f661ed06689ffd62
2016-11-29 13:10:15 -08:00
Treehugger Robot
2fe5762cae Merge "Update makefiles for logging." 2016-11-24 16:41:20 +00:00
Steven Moreland
eccc0081c8 Remove HIDL_GENERATED from things written by hand. am: 33e87b8a76 am: 8b6a886d60 am: 35460073b3
am: 6817b001f1

Change-Id: Ied2a612dbeac019fa764eeb8375d6e68f0ff7e66
2016-11-23 01:51:19 +00:00
Steven Moreland
33e87b8a76 Remove HIDL_GENERATED from things written by hand.
find . -name "*.h" -exec sed -i 's/HIDL_GENERATED_\(.*\)_H_/\U\1_H/g' {}
+

They now match what would be generated by -Lc++-impl. This prevents
confusion over whether or not the files are autogenerated.

Test: pass
Change-Id: I2c9d7887f6d6bdaa19a5c4bfcf02ee3d1dbc81d1
2016-11-22 15:34:39 -08:00
Steven Moreland
bbff14d4bb Merge "Update makefiles for logging." 2016-11-22 17:25:36 +00:00
Keun Soo Yim
8a36c0b01c move VTS HIDL HAL tests to the corresponding interface directories
Bug: 32783461
Test: vts-tradefed; run vts-hal-hidl
Change-Id: Iead44eaf65dcd4de2286267467c4a4a322a88205
2016-11-21 19:16:12 -08:00
Steven Moreland
f8d68ec855 Update makefiles for logging.
Bug: 32943424
Test: pass
Change-Id: Ic88ce6adf04e0e36db53e4cc06ac2ec5a90c011c
2016-11-21 16:28:54 -08:00
Steven Moreland
3e3a0998e0 Update makefiles for logging.
Bug: 32943424
Test: hidl_test
Change-Id: I86dc81935912861073497c07696378895a25f9ee
2016-11-21 16:19:57 -08:00
Yifan Hong
63544eacb6 Split libhidl into base and transport.
Bug: 32756130

Test: mma
Change-Id: Id21cf23abe2910f26bb7895511862443b93dc112
2016-11-18 09:52:57 -08:00
Yifan Hong
6b920e43d3 Split libhidl into base and transport.
Bug: 32756130

Test: mma
Change-Id: Id21cf23abe2910f26bb7895511862443b93dc112
2016-11-18 00:00:54 -08:00
Colin Cross
8f084e00d6 Support genrules with multiple tools
To allow genrules with more than one tool, rename the tool property to
tools and make it an array, replace $tool with $(location <label>),
and use $() for other variables for consistency.

Bug: 31948427
Test: compare build.ninja
Change-Id: I3d714f70a2af0dc60faeee10e09b6ed166601f1d
(cherry picked from commit b785f5b82e)
2016-11-07 10:54:59 -08:00
Colin Cross
b785f5b82e Support genrules with multiple tools
To allow genrules with more than one tool, rename the tool property to
tools and make it an array, replace $tool with $(location <label>),
and use $() for other variables for consistency.

Bug: 31948427
Test: compare build.ninja
Change-Id: I3d714f70a2af0dc60faeee10e09b6ed166601f1d
2016-11-04 22:49:15 -07:00
Yifan Hong
1f4fbc0793 hidl_test: do not use Return for app errors.
Test: hidl_test
Bug: 31348667
Change-Id: Icc7e926bbb886b040fdea0ff9dee8bedad0860e7
2016-11-02 17:47:46 -07:00
Steven Moreland
7982058699 Running update-makefiles for fixed spacing.
Test: pass
Change-Id: I4dcaf70b1c014f3ecf685d4884601be6f17ee51d
2016-11-01 20:06:29 +00:00
Yifan Hong
cc6ad7dfe5 add test for binder inheritance.
Test: hidl_test
Test: `make hidl_test_java` compiles
Change-Id: Ie9217b79e369f2a1e7a7c9ed02524b17e3fc8b7f
2016-10-26 15:27:23 -07:00