Merge master@5406228 into git_qt-dev-plus-aosp.

Change-Id: I3f86757b6f51c71780f4e664e174fa5093d77fe1
BUG: 129345239

3 files changed, 55 insertions, 82 deletions

diff --git a/citadel/citadeld/main.cpp b/citadel/citadeld/main.cpp
index 5ab1862..2f83e84 100644
--- a/citadel/citadeld/main.cpp
+++ b/citadel/citadeld/main.cpp
@@ -214,8 +214,10 @@ class CitadelProxy : public BnCitadeld {
         uint32_t* const appStatus = reinterpret_cast<uint32_t*>(_aidl_return);
 
         // Make the call to the app while holding the lock for that app
-        std::unique_lock<std::mutex> lock(_appLocks[appId]);
-        *appStatus = _client.CallApp(appId, arg, request, response);
+        {
+            std::unique_lock<std::mutex> lock(_appLocks[appId]);
+            *appStatus = _client.CallApp(appId, arg, request, response);
+        }
 
         _stats_collection.schedule();
 
diff --git a/hals/keymaster/citadel/Android.bp b/hals/keymaster/citadel/Android.bp
new file mode 100644
index 0000000..c62578a
--- /dev/null
+++ b/hals/keymaster/citadel/Android.bp
@@ -0,0 +1,51 @@
+//
+// Copyright (C) 2018 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+cc_binary {
+    name: "android.hardware.keymaster@4.0-service.citadel",
+    init_rc: ["android.hardware.keymaster@4.0-service.citadel.rc"],
+
+    srcs: ["service.cpp"],
+
+    required: ["citadeld"],
+    header_libs: ["nos_headers"],
+    shared_libs: [
+        "libbase",
+        "libhidlbase",
+        "libhidltransport",
+        "libnos",
+        "libnosprotos",
+        "libutils",
+        "libprotobuf-cpp-full",
+        "android.hardware.keymaster@4.0",
+        "android.hardware.keymaster@4.0-impl.nos",
+        "libnos_citadeld_proxy",
+        "nos_app_keymaster",
+    ],
+
+    relative_install_path: "hw",
+
+    cflags: [
+        "-pedantic",
+        "-Wall",
+        "-Wextra",
+        "-Werror",
+        "-Wno-zero-length-array",
+    ],
+    conlyflags: ["-std=c11"],
+    vendor: true,
+    owner: "google",
+
+}
diff --git a/hals/keymaster/citadel/Android.mk b/hals/keymaster/citadel/Android.mk
deleted file mode 100644
index 4eb1420..0000000
--- a/hals/keymaster/citadel/Android.mk
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := android.hardware.keymaster@4.0-service.citadel
-LOCAL_INIT_RC := android.hardware.keymaster@4.0-service.citadel.rc
-
-LOCAL_SRC_FILES := service.cpp
-
-LOCAL_REQUIRED_MODULES := citadeld
-LOCAL_HEADER_LIBRARIES := nos_headers
-LOCAL_SHARED_LIBRARIES := \
-    libbase \
-    libhidlbase \
-    libhidltransport \
-    libnos \
-    libnosprotos \
-    libutils \
-    libprotobuf-cpp-full \
-    android.hardware.keymaster@4.0 \
-    android.hardware.keymaster@4.0-impl.nos \
-    libnos_citadeld_proxy \
-    nos_app_keymaster
-
-
-LOCAL_MODULE_RELATIVE_PATH := hw
-
-LOCAL_CFLAGS := -pedantic -Wall -Wextra -Werror -Wno-zero-length-array
-LOCAL_CONLYFLAGS := -std=c11
-LOCAL_CLANG := true
-LOCAL_VENDOR_MODULE := true
-LOCAL_MODULE_OWNER := google
-
-ifneq ($(BUILD_WITHOUT_VENDOR),true)
-ifeq ($(call is-board-platform-in-list, sdm845),true)
-LOCAL_SHARED_LIBRARIES += \
-    libkeymasterprovision \
-    libkeymasterutils \
-    libkeymasterdeviceutils \
-    libQSEEComAPI
-
-LOCAL_CFLAGS += -DENABLE_QCOM_OTF_PROVISIONING=1
-endif
-endif
-
-include $(BUILD_EXECUTABLE)
-
-#cc_binary {
-#    name: "android.hardware.keymaster@4.0-service.citadel",
-#    init_rc: ["android.hardware.keymaster@4.0-service.citadel.rc"],
-#    required: ["citadeld"],
-#    srcs: [
-#        "service.cpp",
-#    ],
-#    defaults: ["nos_hal_service_defaults"],
-#    shared_libs: [
-#        "android.hardware.keymaster@4.0",
-#        "android.hardware.keymaster@4.0-impl.nos",
-#        "libnos_citadeld_proxy",
-#        "nos_app_keymaster",
-#        "libkeymasterprovision",
-#        "libkeymasterutils",
-#        "libkeymasterdeviceutils",
-#        "libQSEEComAPI",
-#    ],
-#}