| commit | 9ff0bb218bd7c6fbb5a638808287b36773ad4f3e | [log] [tgz] |
|---|---|---|
| author | Zhuoyao Zhang <zhuoyao@google.com> | Tue Jul 25 21:14:07 2017 -0700 |
| committer | Zhuoyao Zhang <zhuoyao@google.com> | Tue Jul 25 21:14:07 2017 -0700 |
| tree | b4c14f92386c93eb59f629cfec4be86abdae6a5c | |
| parent | 87a14154a9a11c693bdcba9b7d6ff13b56788def [diff] | |
| parent | 2d2b64e241b04015a65bf2151ef4b5a0b76621da [diff] |
resolve merge conflicts of 8d92561 to oc-mr1-dev Test: I solemnly swear I tested this conflict resolution.
diff --git a/tests/msgq/1.0/default/Android.bp b/tests/msgq/1.0/default/Android.bp index e3c49e7..eb25ac2 100644 --- a/tests/msgq/1.0/default/Android.bp +++ b/tests/msgq/1.0/default/Android.bp
@@ -17,7 +17,6 @@ name: "android.hardware.tests.msgq@1.0-impl", defaults: ["hidl_defaults"], relative_install_path: "hw", - proprietary: true, srcs: [ "TestMsgQ.cpp", "BenchmarkMsgQ.cpp"