Merge "remove "// static" comments"
diff --git a/base/TaskRunner.cpp b/base/TaskRunner.cpp
index 33117e7..782b40b 100644
--- a/base/TaskRunner.cpp
+++ b/base/TaskRunner.cpp
@@ -43,6 +43,10 @@
}
}
+bool TaskRunner::push(const Task &t) {
+ return (mQueue != nullptr) && (!!t) && this->mQueue->push(t);
+}
+
} // namespace details
} // namespace hardware
} // namespace android
diff --git a/base/include/hidl/TaskRunner.h b/base/include/hidl/TaskRunner.h
index 8ecceca..28ea01c 100644
--- a/base/include/hidl/TaskRunner.h
+++ b/base/include/hidl/TaskRunner.h
@@ -52,9 +52,7 @@
* Add a task. Return true if successful, false if
* the queue's size exceeds limit or t doesn't contain a callable target.
*/
- inline bool push(const Task &t) {
- return (mQueue != nullptr) && (!!t) && this->mQueue->push(t);
- }
+ bool push(const Task &t);
private:
std::shared_ptr<SynchronizedQueue<Task>> mQueue;
diff --git a/transport/allocator/1.0/Android.bp b/transport/allocator/1.0/Android.bp
index 5a2423e..e6aa698 100644
--- a/transport/allocator/1.0/Android.bp
+++ b/transport/allocator/1.0/Android.bp
@@ -10,7 +10,7 @@
genrule {
name: "android.hidl.allocator@1.0_genc++",
tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport android.hidl.allocator@1.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport android.hidl.allocator@1.0",
srcs: [
":android.hidl.allocator@1.0_hal",
],
@@ -22,7 +22,7 @@
genrule {
name: "android.hidl.allocator@1.0_genc++_headers",
tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport android.hidl.allocator@1.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport android.hidl.allocator@1.0",
srcs: [
":android.hidl.allocator@1.0_hal",
],
diff --git a/transport/base/1.0/Android.bp b/transport/base/1.0/Android.bp
index 69de736..8382824 100644
--- a/transport/base/1.0/Android.bp
+++ b/transport/base/1.0/Android.bp
@@ -11,7 +11,7 @@
genrule {
name: "android.hidl.base@1.0_genc++",
tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport android.hidl.base@1.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport android.hidl.base@1.0",
srcs: [
":android.hidl.base@1.0_hal",
],
@@ -24,7 +24,7 @@
genrule {
name: "android.hidl.base@1.0_genc++_headers",
tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport android.hidl.base@1.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport android.hidl.base@1.0",
srcs: [
":android.hidl.base@1.0_hal",
],
diff --git a/transport/manager/1.0/Android.bp b/transport/manager/1.0/Android.bp
index 82e7bab..8bdbfa5 100644
--- a/transport/manager/1.0/Android.bp
+++ b/transport/manager/1.0/Android.bp
@@ -11,7 +11,7 @@
genrule {
name: "android.hidl.manager@1.0_genc++",
tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport android.hidl.manager@1.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport android.hidl.manager@1.0",
srcs: [
":android.hidl.manager@1.0_hal",
],
@@ -24,7 +24,7 @@
genrule {
name: "android.hidl.manager@1.0_genc++_headers",
tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport android.hidl.manager@1.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport android.hidl.manager@1.0",
srcs: [
":android.hidl.manager@1.0_hal",
],
diff --git a/transport/memory/1.0/Android.bp b/transport/memory/1.0/Android.bp
index 589f865..01a80ed 100644
--- a/transport/memory/1.0/Android.bp
+++ b/transport/memory/1.0/Android.bp
@@ -11,7 +11,7 @@
genrule {
name: "android.hidl.memory@1.0_genc++",
tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport android.hidl.memory@1.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport android.hidl.memory@1.0",
srcs: [
":android.hidl.memory@1.0_hal",
],
@@ -24,7 +24,7 @@
genrule {
name: "android.hidl.memory@1.0_genc++_headers",
tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport android.hidl.memory@1.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport android.hidl.memory@1.0",
srcs: [
":android.hidl.memory@1.0_hal",
],
diff --git a/transport/token/1.0/Android.bp b/transport/token/1.0/Android.bp
index de94851..4f7e6f4 100644
--- a/transport/token/1.0/Android.bp
+++ b/transport/token/1.0/Android.bp
@@ -10,7 +10,7 @@
genrule {
name: "android.hidl.token@1.0_genc++",
tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport android.hidl.token@1.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport android.hidl.token@1.0",
srcs: [
":android.hidl.token@1.0_hal",
],
@@ -22,7 +22,7 @@
genrule {
name: "android.hidl.token@1.0_genc++_headers",
tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport android.hidl.token@1.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport android.hidl.token@1.0",
srcs: [
":android.hidl.token@1.0_hal",
],