From d6d6843aaac4b88c1bfc8cf545db80d45155ea09 Mon Sep 17 00:00:00 2001 From: John Reck Date: Fri, 14 Aug 2015 14:32:10 -0700 Subject: Remove unneeded main.cpp BUILD_NATIVE_TEST actually includes a main, so this is potentially conflicting Change-Id: Ic1e60ab3c005417e8aef3d3521409ea034616764 --- libs/hwui/unit_tests/Android.mk | 4 +--- libs/hwui/unit_tests/main.cpp | 22 ---------------------- 2 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 libs/hwui/unit_tests/main.cpp diff --git a/libs/hwui/unit_tests/Android.mk b/libs/hwui/unit_tests/Android.mk index 917e646e2303..93cee4a26b05 100644 --- a/libs/hwui/unit_tests/Android.mk +++ b/libs/hwui/unit_tests/Android.mk @@ -14,7 +14,6 @@ # limitations under the License. # -local_target_dir := $(TARGET_OUT_DATA)/local/tmp LOCAL_PATH:= $(call my-dir)/.. include $(CLEAR_VARS) @@ -28,8 +27,7 @@ include $(LOCAL_PATH)/Android.common.mk LOCAL_SRC_FILES += \ unit_tests/ClipAreaTests.cpp \ unit_tests/DamageAccumulatorTests.cpp \ - unit_tests/LinearAllocatorTests.cpp \ - unit_tests/main.cpp + unit_tests/LinearAllocatorTests.cpp include $(BUILD_NATIVE_TEST) diff --git a/libs/hwui/unit_tests/main.cpp b/libs/hwui/unit_tests/main.cpp deleted file mode 100644 index c9b96360b36b..000000000000 --- a/libs/hwui/unit_tests/main.cpp +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (C) 2015 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 - -int main(int argc, char **argv) { - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} -- cgit v1.2.3-59-g8ed1b