commit dae2db6015b9bfdc027dc3c014810f22e9f86092
author Zhuoyao Zhang <zhuoyao@google.com> Wed Jan 11 19:42:12 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 11 19:42:12 2017 +0000
tree 62b0c7aa341409c472c26e98f4d9ff4a18032b0f
parent f85a177f06a15919ef46bad13484290214e95001
parent 5a643b9fbd9f08bd04a38804d647c847c1c93b8f

Merge "Support dynamically enable profiling."

base/include/hidl/Status.h

diff --git a/base/include/hidl/Status.h b/base/include/hidl/Status.h
index f17c968..1be818d 100644
--- a/base/include/hidl/Status.h
+++ b/base/include/hidl/Status.h
@@ -172,12 +172,6 @@
             return mStatus.isOk();
         }
 
-        // TODO(b/31348667) deprecate and replace with 'string description()'
-        const Status& getStatus() const {
-            mCheckedStatus = true;
-            return mStatus;
-        }
-
         // For debugging purposes only
         std::string description() const {
             // Doesn't consider checked.

transport/memory/1.0/default/Android.bp

diff --git a/transport/memory/1.0/default/Android.bp b/transport/memory/1.0/default/Android.bp
index 2b89f07..62fb556 100644
--- a/transport/memory/1.0/default/Android.bp
+++ b/transport/memory/1.0/default/Android.bp
@@ -14,6 +14,7 @@
 
 cc_library_shared {
     name: "android.hidl.memory@1.0-impl",
+    compile_multilib: "both",
     relative_install_path: "hw",
     srcs: [
         "AshmemMapper.cpp",
@@ -55,9 +56,4 @@
         "libutils",
         "libcutils",
     ],
-
-    required: [
-        // only one implementation is allowed
-        "android.hidl.memory@1.0-impl"
-    ]
 }