| commit | 6b21a983aea586b491f4e267b7a7c2b76cdc3c44 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Wed Oct 02 21:10:51 2019 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Oct 02 21:10:51 2019 +0000 |
| tree | 611825f6cfae372a6c018339da03d53dce6d2ae9 | |
| parent | cff26ef9dc2eb160bc5f8de904b4e70314877896 [diff] | |
| parent | 96a0ead3263be3dc55719d8a075ced5b4f367967 [diff] |
Merge "libhidltransport: not in VNDK"
diff --git a/Android.bp b/Android.bp index 9541575..819732d 100644 --- a/Android.bp +++ b/Android.bp
@@ -110,6 +110,5 @@ // on libhidlbase instead. cc_library { name: "libhidltransport", - recovery_available: true, vendor_available: true, }
diff --git a/transport/token/1.0/utils/HybridInterface.cpp b/transport/token/1.0/utils/HybridInterface.cpp index 106ad4e..675db8f 100644 --- a/transport/token/1.0/utils/HybridInterface.cpp +++ b/transport/token/1.0/utils/HybridInterface.cpp
@@ -117,5 +117,4 @@ return static_cast<bool>(transaction); } -}; // namespace android - +} // namespace android
diff --git a/transport/token/1.0/utils/include/hidl/HybridInterface.h b/transport/token/1.0/utils/include/hidl/HybridInterface.h index 5c54d85..d00a0a1 100644 --- a/transport/token/1.0/utils/include/hidl/HybridInterface.h +++ b/transport/token/1.0/utils/include/hidl/HybridInterface.h
@@ -560,6 +560,6 @@ // ---------------------------------------------------------------------- -}; // namespace android +} // namespace android #endif // ANDROID_HYBRIDINTERFACE_H