commit 96f539739e7e84b878396e21e73e3f7f3976e1ad
author Yifan Hong <elsk@google.com> Mon Sep 19 19:25:19 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 19 19:25:19 2016 +0000
tree 40839761a75be412dec15379a5c925ceb2236291
parent 15e1558a040d8ae0a92602737a01e1c882e7067c
parent 252c1c58a4bf14643a7763b4ed6c6005fa9723ef

Merge "Remove @hal_type from .hal files."

nfc/1.0/INfc.hal

diff --git a/nfc/1.0/INfc.hal b/nfc/1.0/INfc.hal
index 147348f..88fd39a 100644
--- a/nfc/1.0/INfc.hal
+++ b/nfc/1.0/INfc.hal
@@ -18,7 +18,6 @@
 
 import INfcClientCallback;
 
-@hal_type(type="NFC")
 interface INfc {
     /*
      * Opens the NFC controller device and performs initialization.

nfc/1.0/INfcClientCallback.hal

diff --git a/nfc/1.0/INfcClientCallback.hal b/nfc/1.0/INfcClientCallback.hal
index 1ed0adb..f10062e 100644
--- a/nfc/1.0/INfcClientCallback.hal
+++ b/nfc/1.0/INfcClientCallback.hal
@@ -16,7 +16,6 @@
 
 package android.hardware.nfc@1.0;
 
-@hal_type(type="NFC")
 interface INfcClientCallback {
     /*
      * The callback passed in from the NFC stack that the HAL

tests/expression/1.0/IExpression.hal

diff --git a/tests/expression/1.0/IExpression.hal b/tests/expression/1.0/IExpression.hal
index 3dea9a4..ead131f 100644
--- a/tests/expression/1.0/IExpression.hal
+++ b/tests/expression/1.0/IExpression.hal
@@ -15,7 +15,7 @@
  */
 
 package android.hardware.tests.expression@1.0;
-@hal_type(type="LIGHT")
+
 interface IExpression {
   enum UInt64LiteralTypeGuessing : uint64_t {
     noSuffixDec1 = 0,