tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove makefile cruft.

Browse source 
Don't manually include stlport, and don't use private bionic headers.

Change-Id: I44dd212fdd5874e625890c548e9d7bf3a9c27912
This commit is contained in:
Dan Albert 2014-09-12 10:48:12 -07:00
parent 52f5425ff5
commit b2aaf3afa1
2 changed files with 18 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Android.mk
View file

@ -22,13 +22,10 @@ common_src_files := \
common_c_includes := \ common_c_includes := \
system/extras/ext4_utils \ system/extras/ext4_utils \
external/openssl/include \ external/openssl/include \
external/stlport/stlport \
bionic \
external/scrypt/lib/crypto external/scrypt/lib/crypto
common_shared_libraries := \ common_shared_libraries := \
libsysutils \ libsysutils \
libstlport \
libcutils \ libcutils \
liblog \ liblog \
libdiskconfig \ libdiskconfig \
@ -45,48 +42,38 @@ common_static_libraries := \
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_MODULE := libvold LOCAL_MODULE := libvold
LOCAL_SRC_FILES := $(common_src_files) LOCAL_SRC_FILES := $(common_src_files)
LOCAL_C_INCLUDES := $(common_c_includes) LOCAL_C_INCLUDES := $(common_c_includes)
LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) LOCAL_SHARED_LIBRARIES := $(common_shared_libraries)
LOCAL_STATIC_LIBRARIES := $(common_static_libraries) LOCAL_STATIC_LIBRARIES := $(common_static_libraries)
LOCAL_MODULE_TAGS := eng tests LOCAL_MODULE_TAGS := eng tests
include external/stlport/libstlport.mk
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_MODULE:= vold LOCAL_MODULE:= vold
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
main.cpp \ main.cpp \
$(common_src_files) $(common_src_files)
LOCAL_C_INCLUDES := $(common_c_includes) LOCAL_C_INCLUDES := $(common_c_includes)
LOCAL_CFLAGS := -Werror=format LOCAL_CFLAGS := -Werror=format
LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) LOCAL_SHARED_LIBRARIES := $(common_shared_libraries)
LOCAL_STATIC_LIBRARIES := $(common_static_libraries) LOCAL_STATIC_LIBRARIES := $(common_static_libraries)
include external/stlport/libstlport.mk
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_SRC_FILES:= vdc.c LOCAL_SRC_FILES:= vdc.c
LOCAL_MODULE:= vdc LOCAL_MODULE:= vdc
LOCAL_C_INCLUDES :=
LOCAL_CFLAGS :=
LOCAL_SHARED_LIBRARIES := libcutils LOCAL_SHARED_LIBRARIES := libcutils
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

42
tests/Android.mk
View file

@ -1,36 +1,20 @@
# Build the unit tests. # Build the unit tests.
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
test_src_files := \ LOCAL_C_INCLUDES := \
VolumeManager_test.cpp system/core/fs_mgr/include \
external/openssl/include \
shared_libraries := \ LOCAL_SHARED_LIBRARIES := \
liblog \ liblog \
libstlport \ libcrypto \
libcrypto
static_libraries := \ LOCAL_STATIC_LIBRARIES := libvold
libvold \ LOCAL_SRC_FILES := VolumeManager_test.cpp
libgtest \ LOCAL_MODULE := vold_tests
libgtest_main LOCAL_MODULE_TAGS := eng tests
c_includes := \ include $(BUILD_NATIVE_TEST)
external/openssl/include \
bionic \
bionic/libstdc++/include \
external/gtest/include \
external/stlport/stlport
module_tags := eng tests
$(foreach file,$(test_src_files), \
$(eval include $(CLEAR_VARS)) \
$(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \
$(eval LOCAL_STATIC_LIBRARIES := $(static_libraries)) \
$(eval LOCAL_C_INCLUDES := $(c_includes)) \
$(eval LOCAL_SRC_FILES := $(file)) \
$(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \
$(eval LOCAL_MODULE_TAGS := $(module_tags)) \
$(eval include $(BUILD_EXECUTABLE)) \
)