Merge "Convert update_host_simulator to Android.bp" (d3e4ee7b) · Commits · e / os / android_bootable_recovery

updater/Android.bp

+37 −6

Original line number	Diff line number	Diff line
		@@ -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,
		},
		},
		}

+0 −29

Original line number	Diff line number	Diff line
		@@ -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)