summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-15 21:22:31 +0100
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-15 21:22:31 +0100
commitf34cfe9683012704a81f8b438043458ed34d2dff (patch)
tree4ab6b75320ecc8746c3c7ee9c6f8deb8513e1032
parentMerge "Fix ioctl FIONREAD call parameters to use int instead of size_t" am: b17cdb26df am: 7e1af2dd40 (diff)
parentMerge "Convert update_host_simulator to Android.bp" (diff)
downloadandroid_bootable_recovery-f34cfe9683012704a81f8b438043458ed34d2dff.tar
android_bootable_recovery-f34cfe9683012704a81f8b438043458ed34d2dff.tar.gz
android_bootable_recovery-f34cfe9683012704a81f8b438043458ed34d2dff.tar.bz2
android_bootable_recovery-f34cfe9683012704a81f8b438043458ed34d2dff.tar.lz
android_bootable_recovery-f34cfe9683012704a81f8b438043458ed34d2dff.tar.xz
android_bootable_recovery-f34cfe9683012704a81f8b438043458ed34d2dff.tar.zst
android_bootable_recovery-f34cfe9683012704a81f8b438043458ed34d2dff.zip
-rw-r--r--updater/Android.bp43
-rw-r--r--updater/Android.mk29
2 files changed, 37 insertions, 35 deletions
diff --git a/updater/Android.bp b/updater/Android.bp
index 8a60ef76a..cbef43099 100644
--- a/updater/Android.bp
+++ b/updater/Android.bp
@@ -13,11 +13,7 @@
// limitations under the License.
cc_defaults {
- name: "libupdater_defaults",
-
- defaults: [
- "recovery_defaults",
- ],
+ name: "libupdater_static_libs",
static_libs: [
"libapplypatch",
@@ -45,6 +41,15 @@ cc_defaults {
"libcutils",
"libutils",
],
+}
+
+cc_defaults {
+ name: "libupdater_defaults",
+
+ defaults: [
+ "recovery_defaults",
+ "libupdater_static_libs",
+ ],
shared_libs: [
"libcrypto",
@@ -64,7 +69,7 @@ cc_defaults {
"libext2_uuid",
"libext2_e2p",
"libext2fs",
- ]
+ ],
}
cc_library_static {
@@ -155,3 +160,29 @@ cc_library_host_static {
"include",
],
}
+
+cc_binary_host {
+ name: "update_host_simulator",
+ defaults: ["libupdater_static_libs"],
+
+ srcs: ["update_simulator_main.cpp"],
+
+ cflags: [
+ "-Wall",
+ "-Werror",
+ ],
+
+ static_libs: [
+ "libupdater_host",
+ "libupdater_core",
+ "libcrypto_static",
+ "libfstab",
+ "libc++fs",
+ ],
+
+ target: {
+ darwin: {
+ enabled: false,
+ },
+ },
+}
diff --git a/updater/Android.mk b/updater/Android.mk
index 6f54d89b8..8a4cd86d9 100644
--- a/updater/Android.mk
+++ b/updater/Android.mk
@@ -111,32 +111,3 @@ inc :=
LOCAL_FORCE_STATIC_EXECUTABLE := true
include $(BUILD_EXECUTABLE)
-
-# TODO(xunchang) move to bp file
-# update_host_simulator (host executable)
-# ===============================
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := update_host_simulator
-LOCAL_MODULE_HOST_OS := linux
-
-LOCAL_SRC_FILES := \
- update_simulator_main.cpp
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/include
-
-LOCAL_CFLAGS := \
- -Wall \
- -Werror
-
-LOCAL_STATIC_LIBRARIES := \
- libupdater_host \
- libupdater_core \
- $(updater_common_static_libraries) \
- libfstab \
- libc++fs
-
-LOCAL_MODULE_CLASS := EXECUTABLES
-
-include $(BUILD_HOST_EXECUTABLE)