Merge "Remove deprecated Android.mk files"
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 44199ab..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (C) 2009 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 $(call all-subdir-makefiles)
diff --git a/src/Android.mk b/src/Android.mk
deleted file mode 100644
index 83deaa9..0000000
--- a/src/Android.mk
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright (C) 2009 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.
-#
-#
-
-# Gtest builds 2 libraries: libgtest and libgtest_main. libgtest
-# contains most of the code (assertions...) and libgtest_main just
-# provide a common main to run the test (ie if you link against
-# libgtest_main you won't/should not provide a main() entry point.
-#
-# We build these 2 libraries for the target device and for the host if
-# it is running linux and using ASTL.
-#
-
-# TODO: The targets below have some redundancy. Check if we cannot
-# condense them using function(s) for the common code.
-
-LOCAL_PATH := $(call my-dir)
-
-libgtest_target_includes := \
- $(LOCAL_PATH)/.. \
- $(LOCAL_PATH)/../include \
-
-libgtest_host_includes := \
- $(LOCAL_PATH)/.. \
- $(LOCAL_PATH)/../include \
-
-libgtest_export_include_dirs := \
- $(LOCAL_PATH)/../include
-
-libgtest_cflags := \
- -Wno-missing-field-initializers \
-
-#######################################################################
-# gtest lib for the NDK
-
-include $(CLEAR_VARS)
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-
-LOCAL_SDK_VERSION := 9
-LOCAL_NDK_STL_VARIANT := stlport_static
-
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := gtest-all.cc
-LOCAL_C_INCLUDES := $(libgtest_target_includes)
-LOCAL_CPPFLAGS := -std=gnu++98
-LOCAL_CFLAGS += $(libgtest_cflags)
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(libgtest_export_include_dirs)
-LOCAL_MODULE := libgtest_ndk
-
-include $(BUILD_STATIC_LIBRARY)
-
-#######################################################################
-# gtest_main for the NDK
-
-include $(CLEAR_VARS)
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-
-LOCAL_SDK_VERSION := 9
-LOCAL_NDK_STL_VARIANT := stlport_static
-
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := gtest_main.cc
-LOCAL_C_INCLUDES := $(libgtest_target_includes)
-LOCAL_CPPFLAGS := -std=gnu++98
-LOCAL_CFLAGS += $(libgtest_cflags)
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(libgtest_export_include_dirs)
-LOCAL_MODULE := libgtest_main_ndk
-
-include $(BUILD_STATIC_LIBRARY)
-
-#######################################################################
-# gtest lib for the NDK, with libc++
-
-include $(CLEAR_VARS)
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-
-LOCAL_SDK_VERSION := 9
-LOCAL_NDK_STL_VARIANT := c++_static
-
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := gtest-all.cc
-LOCAL_C_INCLUDES := $(libgtest_target_includes)
-LOCAL_CPPFLAGS := -std=gnu++98
-LOCAL_CFLAGS += $(libgtest_cflags)
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(libgtest_export_include_dirs)
-LOCAL_MODULE := libgtest_ndk_libcxx
-
-include $(BUILD_STATIC_LIBRARY)
-
-#######################################################################
-# gtest_main for the NDK, with libc++
-
-include $(CLEAR_VARS)
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-
-LOCAL_SDK_VERSION := 9
-LOCAL_NDK_STL_VARIANT := c++_static
-
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := gtest_main.cc
-LOCAL_C_INCLUDES := $(libgtest_target_includes)
-LOCAL_CPPFLAGS := -std=gnu++98
-LOCAL_CFLAGS += $(libgtest_cflags)
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(libgtest_export_include_dirs)
-LOCAL_MODULE := libgtest_main_ndk_libcxx
-
-include $(BUILD_STATIC_LIBRARY)
-
-#######################################################################
-# gtest lib for the NDK, with gnustl
-
-include $(CLEAR_VARS)
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-
-LOCAL_SDK_VERSION := 9
-LOCAL_NDK_STL_VARIANT := gnustl_static
-
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := gtest-all.cc
-LOCAL_C_INCLUDES := $(libgtest_target_includes)
-LOCAL_CPPFLAGS := -std=gnu++98
-LOCAL_CFLAGS += $(libgtest_cflags)
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(libgtest_export_include_dirs)
-LOCAL_MODULE := libgtest_ndk_gnustl
-
-include $(BUILD_STATIC_LIBRARY)
-
-#######################################################################
-# gtest_main for the NDK, with gnustl
-
-include $(CLEAR_VARS)
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-
-LOCAL_SDK_VERSION := 9
-LOCAL_NDK_STL_VARIANT := gnustl_static
-
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := gtest_main.cc
-LOCAL_C_INCLUDES := $(libgtest_target_includes)
-LOCAL_CPPFLAGS := -std=gnu++98
-LOCAL_CFLAGS += $(libgtest_cflags)
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(libgtest_export_include_dirs)
-LOCAL_MODULE := libgtest_main_ndk_gnustl
-
-include $(BUILD_STATIC_LIBRARY)
-
-#######################################################################
-# gtest lib host
-
-include $(CLEAR_VARS)
-
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := gtest-all.cc
-LOCAL_C_INCLUDES := $(libgtest_host_includes)
-LOCAL_CFLAGS += $(libgtest_cflags)
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(libgtest_export_include_dirs)
-LOCAL_MODULE := libgtest_host
-LOCAL_MODULE_HOST_OS := darwin linux windows
-LOCAL_MULTILIB := both
-LOCAL_SANITIZE := never
-LOCAL_RTTI_FLAG := -frtti
-
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-#######################################################################
-# gtest_main lib host
-
-include $(CLEAR_VARS)
-
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := gtest_main.cc
-LOCAL_C_INCLUDES := $(libgtest_host_includes)
-LOCAL_CFLAGS += $(libgtest_cflags)
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(libgtest_export_include_dirs)
-LOCAL_MODULE := libgtest_main_host
-LOCAL_MODULE_HOST_OS := darwin linux windows
-LOCAL_MULTILIB := both
-LOCAL_SANITIZE := never
-
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-#######################################################################
-# Don't build for unbundled branches
-ifeq (,$(TARGET_BUILD_APPS))
-# gtest lib target
-
-include $(CLEAR_VARS)
-
-LOCAL_CLANG := true
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := gtest-all.cc
-LOCAL_C_INCLUDES := $(libgtest_target_includes)
-LOCAL_CFLAGS += $(libgtest_cflags)
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(libgtest_export_include_dirs)
-LOCAL_MODULE := libgtest
-LOCAL_SANITIZE := never
-LOCAL_RTTI_FLAG := -frtti
-
-include $(BUILD_STATIC_LIBRARY)
-
-#######################################################################
-# gtest_main lib target
-
-include $(CLEAR_VARS)
-
-LOCAL_CLANG := true
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := gtest_main.cc
-LOCAL_C_INCLUDES := $(libgtest_target_includes)
-LOCAL_CFLAGS += $(libgtest_cflags)
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(libgtest_export_include_dirs)
-LOCAL_MODULE := libgtest_main
-LOCAL_SANITIZE := never
-
-include $(BUILD_STATIC_LIBRARY)
-endif
-
-# Header only libraries for modules that need gtest_prod.h. Libraries exporting
-# public headers that use gtest_prod.h should pull this in with
-# LOCAL_WHOLE_STATIC_LIBRARIES so that their users will also get the include
-# paths.
-include $(CLEAR_VARS)
-LOCAL_MODULE := libgtest_prod
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(libgtest_export_include_dirs)
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libgtest_prod
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(libgtest_export_include_dirs)
-LOCAL_MODULE_HOST_OS := darwin linux windows
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/test/Android.mk b/test/Android.mk
deleted file mode 100644
index 780be3c..0000000
--- a/test/Android.mk
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright (C) 2009 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.
-#
-#
-
-# Test for gtest. Run using 'runtest'.
-# The linux build and tests are run under valgrind by 'runtest'.
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# TODO: Refactor these as 1st class build templates as suggested in
-# review of the original import.
-
-libgtest_test_common_includes := \
- $(LOCAL_PATH)/../include \
- $(LOCAL_PATH)/..
-
-libgtest_test_includes := $(libgtest_test_common_includes)
-libgtest_test_static_lib := libgtest_main libgtest
-libgtest_test_ldflags :=
-
-libgtest_test_host_includes := $(libgtest_test_common_includes)
-libgtest_test_host_static_lib := libgtest_main_host libgtest_host
-libgtest_test_host_ldflags := -lpthread
-
-# $(2) and $(4) must be set or cleared in sync. $(2) is used to
-# generate the right make target (host vs device). $(4) is used in the
-# module's name and to have different module names for the host vs
-# device builds. Finally $(4) is used to pick up the right set of
-# libraries, typically the host libs have a _host suffix in their
-# names.
-# $(1): source list
-# $(2): "HOST_" or empty
-# $(3): extra CFLAGS or empty
-# $(4): "_host" or empty
-# $(5): "TARGET_OUT_DATA_NATIVE_TESTS" or empty (where to install)
-define _define-test
-$(foreach file,$(1), \
- $(eval include $(CLEAR_VARS)) \
- $(eval LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk) \
- $(eval LOCAL_CPP_EXTENSION := .cc) \
- $(eval LOCAL_SRC_FILES := $(file)) \
- $(eval LOCAL_C_INCLUDES := $(libgtest_test$(4)_includes)) \
- $(eval LOCAL_MODULE := $(notdir $(file:%.cc=%))$(4)) \
- $(eval LOCAL_CFLAGS += $(3) -Wno-empty-body) \
- $(eval LOCAL_LDFLAGS += $(libgtest_test$(4)_ldflags)) \
- $(eval LOCAL_STATIC_LIBRARIES := $(libgtest_test$(4)_static_lib)) \
- $(eval LOCAL_SHARED_LIBRARIES := $(libgtest_test$(4)_shared_lib)) \
- $(if $(2),,$(eval LOCAL_MODULE_TAGS := tests)) \
- $(eval LOCAL_MODULE_PATH := $($(5))) \
- $(eval include $(BUILD_$(2)EXECUTABLE)) \
-)
-endef
-
-define host-test
-$(call _define-test,$(1),HOST_,-O0,_host,)
-endef
-
-define target-test
-$(call _define-test,$(1),,,,TARGET_OUT_DATA_NATIVE_TESTS)
-endef
-
-sources := \
- gtest_all_test.cc \
- gtest-death-test_test.cc \
- gtest_environment_test.cc \
- gtest-listener_test.cc \
- gtest_main_unittest.cc \
- gtest_no_test_unittest.cc \
- gtest-param-test2_test.cc \
- gtest_premature_exit_test.cc \
- gtest_repeat_test.cc \
- gtest_sole_header_test.cc \
- gtest_stress_test.cc \
- gtest-unittest-api_test.cc \
-
-# We don't have exceptions.
-# gtest-death-test_ex_test.cc \
-# gtest_throw_on_failure_ex_test.cc \
-# We don't have tr1::tuple.
-# gtest-tuple_test.cc \
-# These don't build.
-# gtest-param-test_test.cc \
-# gtest-printers_test.cc \
-
-$(call host-test, $(sources))
-$(call target-test, $(sources))
