c03de09173
Since app data paths can live on expanded storage devices, accept the target volume UUID when building paths. The null UUID indicates the default internal storage. To improve readability, start using std::string in several places, which throws when allocations fail. For now, perform last-second sanity checks on incoming path arguments, but we'll eventually want to check arguments as they come through installd.cpp, instead of crashing the entire daemon. Also remove "lib" symlink code from install() and make_user_data(), since we're no longer supporting /data/app-lib. The framework already uses linklib() to create the right symlink for the selected ISA-specific library dir. Bug: 19993667 Change-Id: Ib9343575ffb62bf3981e19375de8f3822fc31e28
37 lines
830 B
Makefile
37 lines
830 B
Makefile
LOCAL_PATH := $(call my-dir)
|
|
|
|
common_src_files := commands.cpp utils.cpp
|
|
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
|
|
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
|
|
include $(BUILD_STATIC_LIBRARY)
|
|
|
|
#
|
|
# Executable
|
|
#
|
|
|
|
include $(CLEAR_VARS)
|
|
LOCAL_MODULE := installd
|
|
LOCAL_MODULE_TAGS := optional
|
|
LOCAL_CFLAGS := $(common_cflags)
|
|
LOCAL_SRC_FILES := installd.cpp $(common_src_files)
|
|
LOCAL_SHARED_LIBRARIES := \
|
|
libbase \
|
|
libcutils \
|
|
liblog \
|
|
libselinux \
|
|
|
|
LOCAL_STATIC_LIBRARIES := libdiskusage
|
|
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
|
|
include $(BUILD_EXECUTABLE)
|