Merge "Remove unneeded main.cpp" (ccc82c05) · Commits · e / os / android_frameworks_base

libs/hwui/unit_tests/Android.mk

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,6 @@
	# limitations under the License.		# limitations under the License.
	#		#

	local_target_dir := $(TARGET_OUT_DATA)/local/tmp
	LOCAL_PATH:= $(call my-dir)/..		LOCAL_PATH:= $(call my-dir)/..

	include $(CLEAR_VARS)		include $(CLEAR_VARS)
	@@ -28,8 +27,7 @@ include $(LOCAL_PATH)/Android.common.mk
	LOCAL_SRC_FILES += \		LOCAL_SRC_FILES += \
	unit_tests/ClipAreaTests.cpp \		unit_tests/ClipAreaTests.cpp \
	unit_tests/DamageAccumulatorTests.cpp \		unit_tests/DamageAccumulatorTests.cpp \
	unit_tests/LinearAllocatorTests.cpp \		unit_tests/LinearAllocatorTests.cpp
	unit_tests/main.cpp


	include $(BUILD_NATIVE_TEST)		include $(BUILD_NATIVE_TEST)

deleted100644 → 0

+0 −22

Original line number	Original line	Diff line number	Diff line
	/*
	* 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 <gtest/gtest.h>

	int main(int argc, char **argv) {
	::testing::InitGoogleTest(&argc, argv);
	return RUN_ALL_TESTS();
	}