Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4355c0c9 authored by Dan Albert's avatar Dan Albert Committed by Android Git Automerger
Browse files

am e1e3d278: Merge "Clean cruft out of makefiles." 

* commit 'e1e3d278':
  Clean cruft out of makefiles.
parents 9e8b5289 e1e3d278

cmds/installd/tests/Android.mk

+1 −3
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 := \
@@ -9,13 +10,10 @@ test_src_files := \ 
shared_libraries := \

    libutils \

    libcutils \

    libstlport



static_libraries := \

    libinstalld \

    libdiskusage \

    libgtest \

    libgtest_main



c_includes := \

    frameworks/native/cmds/installd

libs/gui/tests/Android.mk

+1 −7
Original line number Diff line number Diff line 
# Build the unit tests,

LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk



LOCAL_MODULE := libgui_test
@@ -31,17 +32,10 @@ LOCAL_SHARED_LIBRARIES := \ 
	libbinder \

	libcutils \

	libgui \

	libstlport \

	libsync \

	libui \

	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)

# to integrate with auto-test framework.

include $(BUILD_NATIVE_TEST)

libs/input/tests/Android.mk

+2 −6
Original line number Diff line number Diff line 
# Build the unit tests.

LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



# Build the unit tests.

test_src_files := \
@@ -14,14 +13,10 @@ shared_libraries := \ 
    libutils \

    libbinder \

    libui \

    libstlport



static_libraries := \

    libgtest \

    libgtest_main



$(foreach file,$(test_src_files), \

    $(eval include $(CLEAR_VARS)) \

    $(eval LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk) \

    $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \

    $(eval LOCAL_STATIC_LIBRARIES := $(static_libraries)) \

    $(eval LOCAL_SRC_FILES := $(file)) \
@@ -33,6 +28,7 @@ $(foreach file,$(test_src_files), \ 
# run. All assertions are static_asserts and will fail during

# buildtime if something's wrong.

include $(CLEAR_VARS)

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

LOCAL_SRC_FILES := StructLayout_test.cpp

LOCAL_MODULE := StructLayout_test

LOCAL_CFLAGS := -std=c++11 -O0

opengl/libs/GLES_trace/Android.mk

+3 −3
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)



include $(CLEAR_VARS)

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk



LOCAL_SRC_FILES := \

    src/gltrace_api.cpp \
@@ -15,14 +16,12 @@ LOCAL_SRC_FILES := \ 
LOCAL_C_INCLUDES := \

    $(LOCAL_PATH) \

    $(LOCAL_PATH)/../ \

    external/stlport/stlport \

    external/protobuf/src \

    external \

    bionic



LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI

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\"
@@ -32,4 +31,5 @@ LOCAL_C_INCLUDES += bionic/libc/private 
LOCAL_MODULE:= libGLES_trace

LOCAL_MODULE_TAGS := optional



include external/stlport/libstlport.mk

include $(BUILD_SHARED_LIBRARY)

opengl/tests/EGLTest/Android.mk

+2 −10
Original line number Diff line number Diff line 
# Build the unit tests.

LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk



LOCAL_MODULE := EGL_test
@@ -14,27 +15,18 @@ LOCAL_SHARED_LIBRARIES := \ 
	libEGL \

	libcutils \

	libbinder \

	libstlport \

	libutils \

	libgui \



LOCAL_STATIC_LIBRARIES := \

	libgtest \

	libgtest_main \



LOCAL_C_INCLUDES := \

    bionic \

    bionic/libc/private \

    bionic/libstdc++/include \

    external/gtest/include \

    external/stlport/stlport \

    frameworks/native/opengl/libs \

    frameworks/native/opengl/libs/EGL \



# gold in binutils 2.22 will warn about the usage of mktemp

LOCAL_LDFLAGS += -Wl,--no-fatal-warnings



include $(BUILD_EXECUTABLE)

include $(BUILD_NATIVE_TEST)



# Include subdirectory makefiles

# ============================================================