Merge "update_verifier: Move to Soong." am: ed022fccdf
am: 9bc286dd71
Change-Id: I17da945eaa609f40d9601109c435110599ed88f6
diff --git a/Android.mk b/Android.mk
index 010a516..55ec387 100644
--- a/Android.mk
+++ b/Android.mk
@@ -215,4 +215,3 @@
$(LOCAL_PATH)/tests/Android.mk \
$(LOCAL_PATH)/tools/Android.mk \
$(LOCAL_PATH)/updater/Android.mk \
- $(LOCAL_PATH)/update_verifier/Android.mk \
diff --git a/update_verifier/Android.bp b/update_verifier/Android.bp
new file mode 100644
index 0000000..f6c7056
--- /dev/null
+++ b/update_verifier/Android.bp
@@ -0,0 +1,83 @@
+// 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_defaults {
+ name: "update_verifier_defaults",
+
+ cflags: [
+ "-Wall",
+ "-Werror",
+ ],
+
+ local_include_dirs: [
+ "include",
+ ],
+}
+
+cc_library_static {
+ name: "libupdate_verifier",
+
+ defaults: [
+ "update_verifier_defaults",
+ ],
+
+ srcs: [
+ "update_verifier.cpp",
+ ],
+
+ export_include_dirs: [
+ "include",
+ ],
+
+ static_libs: [
+ "libotautil",
+ ],
+
+ shared_libs: [
+ "android.hardware.boot@1.0",
+ "libbase",
+ "libcutils",
+ ],
+}
+
+cc_binary {
+ name: "update_verifier",
+
+ defaults: [
+ "update_verifier_defaults",
+ ],
+
+ srcs: [
+ "update_verifier_main.cpp",
+ ],
+
+ static_libs: [
+ "libupdate_verifier",
+ "libotautil",
+ ],
+
+ shared_libs: [
+ "android.hardware.boot@1.0",
+ "libbase",
+ "libcutils",
+ "libhardware",
+ "libhidlbase",
+ "liblog",
+ "libutils",
+ ],
+
+ init_rc: [
+ "update_verifier.rc",
+ ],
+}
diff --git a/update_verifier/Android.mk b/update_verifier/Android.mk
deleted file mode 100644
index 8d61cd1..0000000
--- a/update_verifier/Android.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright (C) 2015 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)
-
-# libupdate_verifier (static library)
-# ===============================
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
- update_verifier.cpp
-
-LOCAL_MODULE := libupdate_verifier
-
-LOCAL_STATIC_LIBRARIES := \
- libotautil
-
-LOCAL_SHARED_LIBRARIES := \
- libbase \
- libcutils \
- android.hardware.boot@1.0
-
-LOCAL_CFLAGS := -Wall -Werror
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
- $(LOCAL_PATH)/include
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/include
-
-include $(BUILD_STATIC_LIBRARY)
-
-# update_verifier (executable)
-# ===============================
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
- update_verifier_main.cpp
-
-LOCAL_MODULE := update_verifier
-LOCAL_STATIC_LIBRARIES := \
- libupdate_verifier \
- libotautil
-
-LOCAL_SHARED_LIBRARIES := \
- libbase \
- libcutils \
- libhardware \
- liblog \
- libutils \
- libhidlbase \
- android.hardware.boot@1.0
-
-LOCAL_CFLAGS := -Wall -Werror
-
-LOCAL_INIT_RC := update_verifier.rc
-
-include $(BUILD_EXECUTABLE)