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

Commit 0cb2c99f authored by Dan Albert's avatar Dan Albert
Browse files

Clean up test makefiles. 

The build system takes care of linking the correct STL and gtest
libraries for you, and specifying them manually confuses the build
system when using libc++.

Change-Id: I6ac66c2f4e97cd3c55efb7a85e10922420554e7f
parent 032ecb7f

camera/tests/Android.mk

+1 −9
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:= \

	main.cpp \

	ProCameraTests.cpp \



LOCAL_SHARED_LIBRARIES := \

	libutils \

	libcutils \

	libstlport \

	libcamera_metadata \

	libcamera_client \

	libgui \
@@ -17,14 +16,7 @@ LOCAL_SHARED_LIBRARIES := \ 
	libdl \

	libbinder



LOCAL_STATIC_LIBRARIES := \

	libgtest



LOCAL_C_INCLUDES += \

	bionic \

	bionic/libstdc++/include \

	external/gtest/include \

	external/stlport/stlport \

	system/media/camera/include \

	frameworks/av/services/camera/libcameraservice \

	frameworks/av/include/camera \

camera/tests/main.cpp

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include <gtest/gtest.h>





int main(int argc, char **argv) {



    ::testing::InitGoogleTest(&argc, argv);



    int ret = RUN_ALL_TESTS();



    return ret;

}

media/libstagefright/tests/Android.mk

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

LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



ifneq ($(TARGET_SIMULATOR),true)

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk



LOCAL_MODULE := SurfaceMediaSource_test
@@ -22,30 +21,19 @@ LOCAL_SHARED_LIBRARIES := \ 
	libstagefright \

	libstagefright_foundation \

	libstagefright_omx \

	libstlport \

	libsync \

	libui \

	libutils \

	liblog



LOCAL_STATIC_LIBRARIES := \

	libgtest \

	libgtest_main \



LOCAL_C_INCLUDES := \

    bionic \

    bionic/libstdc++/include \

    external/gtest/include \

    external/stlport/stlport \

	frameworks/av/media/libstagefright \

	frameworks/av/media/libstagefright/include \

	$(TOP)/frameworks/native/include/media/openmax \



LOCAL_32_BIT_ONLY := true



include $(BUILD_EXECUTABLE)



endif

include $(BUILD_NATIVE_TEST)



# Include subdirectory makefiles

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