Remove makefile cruft.
Don't manually include stlport, and don't use private bionic headers.
Change-Id: I44dd212fdd5874e625890c548e9d7bf3a9c27912
diff --git a/Android.mk b/Android.mk
index 9ad0edd..1a8547c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,13 +22,10 @@
common_c_includes := \
system/extras/ext4_utils \
external/openssl/include \
- external/stlport/stlport \
- bionic \
external/scrypt/lib/crypto
common_shared_libraries := \
libsysutils \
- libstlport \
libcutils \
liblog \
libdiskconfig \
@@ -45,48 +42,38 @@
include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_MODULE := libvold
-
LOCAL_SRC_FILES := $(common_src_files)
-
LOCAL_C_INCLUDES := $(common_c_includes)
-
LOCAL_SHARED_LIBRARIES := $(common_shared_libraries)
-
LOCAL_STATIC_LIBRARIES := $(common_static_libraries)
-
LOCAL_MODULE_TAGS := eng tests
+include external/stlport/libstlport.mk
include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_MODULE:= vold
-
LOCAL_SRC_FILES := \
main.cpp \
$(common_src_files)
LOCAL_C_INCLUDES := $(common_c_includes)
-
LOCAL_CFLAGS := -Werror=format
-
LOCAL_SHARED_LIBRARIES := $(common_shared_libraries)
-
LOCAL_STATIC_LIBRARIES := $(common_static_libraries)
+include external/stlport/libstlport.mk
include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_SRC_FILES:= vdc.c
-
LOCAL_MODULE:= vdc
-
-LOCAL_C_INCLUDES :=
-
-LOCAL_CFLAGS :=
-
LOCAL_SHARED_LIBRARIES := libcutils
include $(BUILD_EXECUTABLE)
diff --git a/tests/Android.mk b/tests/Android.mk
index 8ae4b5d..bcdcfca 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -1,36 +1,20 @@
# Build the unit tests.
LOCAL_PATH := $(call my-dir)
+
include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-test_src_files := \
- VolumeManager_test.cpp
+LOCAL_C_INCLUDES := \
+ system/core/fs_mgr/include \
+ external/openssl/include \
-shared_libraries := \
- liblog \
- libstlport \
- libcrypto
+LOCAL_SHARED_LIBRARIES := \
+ liblog \
+ libcrypto \
-static_libraries := \
- libvold \
- libgtest \
- libgtest_main
+LOCAL_STATIC_LIBRARIES := libvold
+LOCAL_SRC_FILES := VolumeManager_test.cpp
+LOCAL_MODULE := vold_tests
+LOCAL_MODULE_TAGS := eng tests
-c_includes := \
- 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)) \
-)
+include $(BUILD_NATIVE_TEST)