Merge "Revert "Move installd back to Android.mk."" am: 1ae0486a54 am: 23ce729c01 am: 907ad285eb (ab5922d4) · Commits · e / os / platform_frameworks_native

cmds/installd/Android.bp

+56 −0

Original line number	Diff line number	Diff line
		cc_defaults {
		name: "installd_defaults",

		cflags: [
		"-Wall",
		"-Werror",
		],
		srcs: [
		"commands.cpp",
		"globals.cpp",
		"utils.cpp",
		"binder/android/os/IInstalld.aidl",
		],
		shared_libs: [
		"libbase",
		"libbinder",
		"libcutils",
		"liblog",
		"liblogwrap",
		"libselinux",
		"libutils",
		],

		clang: true,
		}

		//
		// Static library used in testing and executable
		//

		cc_library_static {
		name: "libinstalld",
		defaults: ["installd_defaults"],

		export_include_dirs: ["."],
		aidl: {
		export_aidl_headers: true,
		},
		}

		//
		// Executable
		//

		cc_binary {
		name: "installd",
		defaults: ["installd_defaults"],
		srcs: ["installd.cpp"],

		static_libs: ["libdiskusage"],

		init_rc: ["installd.rc"],
		}

		// OTA chroot tool

		cc_binary {
		@@ -14,3 +68,5 @@ cc_binary {
		"liblog",
		],
		}

		subdirs = ["tests"]

+0 −48

Original line number	Diff line number	Diff line
		@@ -61,51 +61,3 @@ LOCAL_SRC_FILES := otapreopt_script.sh
		LOCAL_REQUIRED_MODULES := otapreopt otapreopt_chroot otapreopt_slot

		include $(BUILD_PREBUILT)

		common_src_files := commands.cpp globals.cpp utils.cpp binder/android/os/IInstalld.aidl
		common_cflags := -Wall -Werror

		#
		# Static library used in testing and executable
		#

		include $(CLEAR_VARS)
		LOCAL_MODULE := libinstalld
		LOCAL_MODULE_TAGS := eng tests
		LOCAL_SRC_FILES := $(common_src_files)
		LOCAL_CFLAGS := $(common_cflags)
		LOCAL_SHARED_LIBRARIES := \
		libbase \
		libbinder \
		liblogwrap \
		libselinux \
		libutils \

		LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
		LOCAL_CLANG := true
		include $(BUILD_STATIC_LIBRARY)

		#
		# Executable
		#

		include $(CLEAR_VARS)
		LOCAL_MODULE := installd
		LOCAL_MODULE_TAGS := optional
		LOCAL_CFLAGS := $(common_cflags)
		LOCAL_SRC_FILES := $(common_src_files) installd.cpp

		LOCAL_SHARED_LIBRARIES := \
		libbase \
		libbinder \
		libcutils \
		liblog \
		liblogwrap \
		libselinux \
		libutils

		LOCAL_STATIC_LIBRARIES := libdiskusage
		LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
		LOCAL_INIT_RC := installd.rc
		LOCAL_CLANG := true
		include $(BUILD_EXECUTABLE)

0 → 100644

+16 −0

Original line number	Diff line number	Diff line
		// Build the unit tests for installd
		cc_test {
		name: "installd_utils_test",
		clang: true,
		srcs: ["installd_utils_test.cpp"],
		shared_libs: [
		"libbase",
		"liblog",
		"libutils",
		"libcutils",
		],
		static_libs: [
		"libinstalld",
		"libdiskusage",
		],
		}

deleted100644 → 0

+0 −32

Original line number	Diff line number	Diff line
		# Build the unit tests for installd
		LOCAL_PATH := $(call my-dir)
		include $(CLEAR_VARS)
		LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

		# Build the unit tests.
		test_src_files := \
		installd_utils_test.cpp

		shared_libraries := \
		libbase \
		liblog \
		libutils \
		libcutils \

		static_libraries := \
		libinstalld \
		libdiskusage \

		c_includes := \
		frameworks/native/cmds/installd

		$(foreach file,$(test_src_files), \
		$(eval include $(CLEAR_VARS)) \
		$(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \
		$(eval LOCAL_STATIC_LIBRARIES := $(static_libraries)) \
		$(eval LOCAL_SRC_FILES := $(file)) \
		$(eval LOCAL_C_INCLUDES := $(c_includes)) \
		$(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \
		$(eval LOCAL_CLANG := true) \
		$(eval include $(BUILD_NATIVE_TEST)) \
		)