diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2020-01-15 21:07:50 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2020-01-15 21:07:50 +0100 |
| commit | 1d5b35dfb55b8a4f40c27898c00a64336a17085b (patch) | |
| tree | 4ab6b75320ecc8746c3c7ee9c6f8deb8513e1032 | |
| parent | Merge "Fix ioctl FIONREAD call parameters to use int instead of size_t" (diff) | |
| parent | Merge "Convert update_host_simulator to Android.bp" (diff) | |
| download | android_bootable_recovery-1d5b35dfb55b8a4f40c27898c00a64336a17085b.tar android_bootable_recovery-1d5b35dfb55b8a4f40c27898c00a64336a17085b.tar.gz android_bootable_recovery-1d5b35dfb55b8a4f40c27898c00a64336a17085b.tar.bz2 android_bootable_recovery-1d5b35dfb55b8a4f40c27898c00a64336a17085b.tar.lz android_bootable_recovery-1d5b35dfb55b8a4f40c27898c00a64336a17085b.tar.xz android_bootable_recovery-1d5b35dfb55b8a4f40c27898c00a64336a17085b.tar.zst android_bootable_recovery-1d5b35dfb55b8a4f40c27898c00a64336a17085b.zip | |
| -rw-r--r-- | updater/Android.bp | 43 | ||||
| -rw-r--r-- | updater/Android.mk | 29 |
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) |