ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean cruft out of makefiles.

Browse Source 
Cleans up manual uses of stlport and bionic (and removes uses of private
bionic headers).

Change-Id: I157309d702e59152adfa3450939082248ae4c043
This commit is contained in:
Dan Albert 2014-09-11 18:45:33 -07:00
parent 07c9557f60
commit b79dfe6721
8 changed files with 17 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmds/installd/tests/Android.mk
View File

@ -1,6 +1,7 @@
# Build the unit tests for installd # Build the unit tests for installd
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
# Build the unit tests. # Build the unit tests.
test_src_files := \ test_src_files := \
@ -9,13 +10,10 @@ test_src_files := \
shared_libraries := \ shared_libraries := \
libutils \ libutils \
libcutils \ libcutils \
libstlport
static_libraries := \ static_libraries := \
libinstalld \ libinstalld \
libdiskusage \ libdiskusage \
libgtest \
libgtest_main
c_includes := \ c_includes := \
frameworks/native/cmds/installd frameworks/native/cmds/installd

8
libs/gui/tests/Android.mk
View File

@ -1,6 +1,7 @@
# 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
LOCAL_MODULE := libgui_test LOCAL_MODULE := libgui_test
@ -20,17 +21,10 @@ LOCAL_SHARED_LIBRARIES := \
libbinder \ libbinder \
libcutils \ libcutils \
libgui \ libgui \
libstlport \
libsync \ libsync \
libui \ libui \
libutils \ libutils \
LOCAL_C_INCLUDES := \
bionic \
bionic/libstdc++/include \
external/gtest/include \
external/stlport/stlport \
# Build the binary to $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE) # Build the binary to $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE)
# to integrate with auto-test framework. # to integrate with auto-test framework.
include $(BUILD_NATIVE_TEST) include $(BUILD_NATIVE_TEST)

8
libs/input/tests/Android.mk
View File

@ -1,6 +1,5 @@
# Build the unit tests. # Build the unit tests.
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
# Build the unit tests. # Build the unit tests.
test_src_files := \ test_src_files := \
@ -14,14 +13,10 @@ shared_libraries := \
libutils \ libutils \
libbinder \ libbinder \
libui \ libui \
libstlport
static_libraries := \
libgtest \
libgtest_main
$(foreach file,$(test_src_files), \ $(foreach file,$(test_src_files), \
$(eval include $(CLEAR_VARS)) \ $(eval include $(CLEAR_VARS)) \
$(eval LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk) \
$(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \ $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \
$(eval LOCAL_STATIC_LIBRARIES := $(static_libraries)) \ $(eval LOCAL_STATIC_LIBRARIES := $(static_libraries)) \
$(eval LOCAL_SRC_FILES := $(file)) \ $(eval LOCAL_SRC_FILES := $(file)) \
@ -33,6 +28,7 @@ $(foreach file,$(test_src_files), \
# run. All assertions are static_asserts and will fail during # run. All assertions are static_asserts and will fail during
# buildtime if something's wrong. # buildtime if something's wrong.
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_SRC_FILES := StructLayout_test.cpp LOCAL_SRC_FILES := StructLayout_test.cpp
LOCAL_MODULE := StructLayout_test LOCAL_MODULE := StructLayout_test
LOCAL_CFLAGS := -std=c++11 -O0 LOCAL_CFLAGS := -std=c++11 -O0

6
opengl/libs/GLES_trace/Android.mk
View File

@ -1,6 +1,7 @@
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
src/gltrace_api.cpp \ src/gltrace_api.cpp \
@ -15,14 +16,12 @@ LOCAL_SRC_FILES := \
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
$(LOCAL_PATH) \ $(LOCAL_PATH) \
$(LOCAL_PATH)/../ \ $(LOCAL_PATH)/../ \
external/stlport/stlport \
external/protobuf/src \ external/protobuf/src \
external \ external \
bionic
LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI
LOCAL_STATIC_LIBRARIES := libprotobuf-cpp-2.3.0-lite liblzf LOCAL_STATIC_LIBRARIES := libprotobuf-cpp-2.3.0-lite liblzf
LOCAL_SHARED_LIBRARIES := libcutils libutils liblog libstlport LOCAL_SHARED_LIBRARIES := libcutils libutils liblog
LOCAL_CFLAGS += -DLOG_TAG=\"libGLES_trace\" LOCAL_CFLAGS += -DLOG_TAG=\"libGLES_trace\"
@ -32,4 +31,5 @@ LOCAL_C_INCLUDES += bionic/libc/private
LOCAL_MODULE:= libGLES_trace LOCAL_MODULE:= libGLES_trace
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
include external/stlport/libstlport.mk
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

12
opengl/tests/EGLTest/Android.mk
View File

@ -1,6 +1,7 @@
# 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
LOCAL_MODULE := EGL_test LOCAL_MODULE := EGL_test
@ -14,27 +15,18 @@ LOCAL_SHARED_LIBRARIES := \
libEGL \ libEGL \
libcutils \ libcutils \
libbinder \ libbinder \
libstlport \
libutils \ libutils \
libgui \ libgui \
LOCAL_STATIC_LIBRARIES := \
libgtest \
libgtest_main \
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
bionic \
bionic/libc/private \ bionic/libc/private \
bionic/libstdc++/include \
external/gtest/include \
external/stlport/stlport \
frameworks/native/opengl/libs \ frameworks/native/opengl/libs \
frameworks/native/opengl/libs/EGL \ frameworks/native/opengl/libs/EGL \
# gold in binutils 2.22 will warn about the usage of mktemp # gold in binutils 2.22 will warn about the usage of mktemp
LOCAL_LDFLAGS += -Wl,--no-fatal-warnings LOCAL_LDFLAGS += -Wl,--no-fatal-warnings
include $(BUILD_EXECUTABLE) include $(BUILD_NATIVE_TEST)
# Include subdirectory makefiles # Include subdirectory makefiles
# ============================================================ # ============================================================

13
opengl/tests/hwc/Android.mk
View File

@ -15,24 +15,20 @@
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
LOCAL_MODULE:= libhwcTest LOCAL_MODULE:= libhwcTest
LOCAL_SRC_FILES:= hwcTestLib.cpp LOCAL_SRC_FILES:= hwcTestLib.cpp
LOCAL_C_INCLUDES += system/extras/tests/include \ LOCAL_C_INCLUDES += system/extras/tests/include \
bionic \
bionic/libstdc++/include \
external/stlport/stlport \
$(call include-path-for, opengl-tests-includes) $(call include-path-for, opengl-tests-includes)
LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
LOCAL_SHARED_LIBRARIES += libcutils libutils libstlport include external/stlport/libstlport.mk
LOCAL_STATIC_LIBRARIES += libglTest
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_SRC_FILES:= hwcStress.cpp LOCAL_SRC_FILES:= hwcStress.cpp
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
@ -65,6 +61,7 @@ LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
include $(BUILD_NATIVE_TEST) include $(BUILD_NATIVE_TEST)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_SRC_FILES:= hwcRects.cpp LOCAL_SRC_FILES:= hwcRects.cpp
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
@ -95,6 +92,7 @@ LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
include $(BUILD_NATIVE_TEST) include $(BUILD_NATIVE_TEST)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_SRC_FILES:= hwcColorEquiv.cpp LOCAL_SRC_FILES:= hwcColorEquiv.cpp
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
@ -125,6 +123,7 @@ LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
include $(BUILD_NATIVE_TEST) include $(BUILD_NATIVE_TEST)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_SRC_FILES:= hwcCommit.cpp LOCAL_SRC_FILES:= hwcCommit.cpp
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \

7
opengl/tests/lib/Android.mk
View File

@ -15,18 +15,13 @@
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
LOCAL_MODULE:= libglTest LOCAL_MODULE:= libglTest
LOCAL_SRC_FILES:= glTestLib.cpp LOCAL_SRC_FILES:= glTestLib.cpp
LOCAL_C_INCLUDES += system/extras/tests/include \ LOCAL_C_INCLUDES += system/extras/tests/include \
bionic \
bionic/libstdc++/include \
external/stlport/stlport \
$(call include-path-for, opengl-tests-includes) $(call include-path-for, opengl-tests-includes)
LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
LOCAL_SHARED_LIBRARIES += libcutils libutils libstlport
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

8
services/surfaceflinger/tests/Android.mk
View File

@ -1,6 +1,7 @@
# 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
LOCAL_MODULE := SurfaceFlinger_test LOCAL_MODULE := SurfaceFlinger_test
@ -15,16 +16,9 @@ LOCAL_SHARED_LIBRARIES := \
libbinder \ libbinder \
libcutils \ libcutils \
libgui \ libgui \
libstlport \
libui \ libui \
libutils \ libutils \
LOCAL_C_INCLUDES := \
bionic \
bionic/libstdc++/include \
external/gtest/include \
external/stlport/stlport \
# Build the binary to $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE) # Build the binary to $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE)
# to integrate with auto-test framework. # to integrate with auto-test framework.
include $(BUILD_NATIVE_TEST) include $(BUILD_NATIVE_TEST)