Move Android.mk and Android.bp into top level

Move third_party/android/Android.* into the top level.  Future upstream
updates to third_party/android should automatically get merged to the
top level by git rename detection.

Tests: m -j test-art-host
Change-Id: I02110cdce22d58d1f29f4271909ebfe33e56a5f4

1 files changed, 3 insertions, 405 deletions

diff --git a/Android.mk b/Android.mk
index e501a3aa..a2b4288a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,9 +1,4 @@
-# NOTE: `Android.mk` is automatically generated via the
-# `third_party/android/generate_android_mk.py` script. Changes should be applied
-# to `third_party/android/Android.mk.template`, and the script run to regenerate
-# `Android.mk`.
-
-# Copyright (C) 2015 The Android Open Source Project
+# Copyright (C) 2016 The Android Open Source Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -30,7 +25,7 @@
 # SUCH DAMAGE.
 #
 #
-# Copyright (c) 2015 VIXL authors
+# Copyright (c) 2016 VIXL authors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -58,408 +53,11 @@
 
 LOCAL_PATH:= $(call my-dir)
 
-vixl_root := $(LOCAL_PATH)/
-vixl_src_include_path := $(vixl_root)/src/
-vixl_test_include_path := $(vixl_src_include_path) $(vixl_root)/test/
-
-vixl_common_files := \
-  src/code-buffer-vixl.cc \
-  src/compiler-intrinsics-vixl.cc \
-  src/utils-vixl.cc
-
-vixl_src_files_arm := \
-  src/aarch32/assembler-aarch32.cc \
-  src/aarch32/disasm-aarch32.cc \
-  src/aarch32/instructions-aarch32.cc \
-  src/aarch32/macro-assembler-aarch32.cc \
-  src/aarch32/operand-aarch32.cc
-
-vixl_src_files_arm64 := \
-  src/aarch64/assembler-aarch64.cc \
-  src/aarch64/cpu-aarch64.cc \
-  src/aarch64/debugger-aarch64.cc \
-  src/aarch64/decoder-aarch64.cc \
-  src/aarch64/disasm-aarch64.cc \
-  src/aarch64/instructions-aarch64.cc \
-  src/aarch64/instrument-aarch64.cc \
-  src/aarch64/logic-aarch64.cc \
-  src/aarch64/macro-assembler-aarch64.cc \
-  src/aarch64/operands-aarch64.cc \
-  src/aarch64/simulator-aarch64.cc
-
-vixl_test_files := \
-  test/aarch32/test-assembler-aarch32.cc \
-  test/aarch32/test-assembler-cond-rd-memop-immediate-512-a32.cc \
-  test/aarch32/test-assembler-cond-rd-memop-immediate-8192-a32.cc \
-  test/aarch32/test-assembler-cond-rd-memop-rs-a32.cc \
-  test/aarch32/test-assembler-cond-rd-memop-rs-shift-amount-1to31-a32.cc \
-  test/aarch32/test-assembler-cond-rd-memop-rs-shift-amount-1to32-a32.cc \
-  test/aarch32/test-assembler-cond-rd-operand-const-a32.cc \
-  test/aarch32/test-assembler-cond-rd-operand-const-t32.cc \
-  test/aarch32/test-assembler-cond-rd-operand-imm16-t32.cc \
-  test/aarch32/test-assembler-cond-rd-operand-rn-a32.cc \
-  test/aarch32/test-assembler-cond-rd-operand-rn-ror-amount-a32.cc \
-  test/aarch32/test-assembler-cond-rd-operand-rn-ror-amount-t32.cc \
-  test/aarch32/test-assembler-cond-rd-operand-rn-shift-amount-1to31-a32.cc \
-  test/aarch32/test-assembler-cond-rd-operand-rn-shift-amount-1to31-t32-in-it-block.cc \
-  test/aarch32/test-assembler-cond-rd-operand-rn-shift-amount-1to31-t32.cc \
-  test/aarch32/test-assembler-cond-rd-operand-rn-shift-amount-1to32-a32.cc \
-  test/aarch32/test-assembler-cond-rd-operand-rn-shift-amount-1to32-t32-in-it-block.cc \
-  test/aarch32/test-assembler-cond-rd-operand-rn-shift-amount-1to32-t32.cc \
-  test/aarch32/test-assembler-cond-rd-operand-rn-shift-rs-a32.cc \
-  test/aarch32/test-assembler-cond-rd-operand-rn-shift-rs-t32-in-it-block.cc \
-  test/aarch32/test-assembler-cond-rd-operand-rn-shift-rs-t32-narrow-out-it-block.cc \
-  test/aarch32/test-assembler-cond-rd-operand-rn-shift-rs-t32.cc \
-  test/aarch32/test-assembler-cond-rd-operand-rn-t32-identical-low-registers-in-it-block.cc \
-  test/aarch32/test-assembler-cond-rd-operand-rn-t32-in-it-block.cc \
-  test/aarch32/test-assembler-cond-rd-operand-rn-t32-low-registers-in-it-block.cc \
-  test/aarch32/test-assembler-cond-rd-operand-rn-t32.cc \
-  test/aarch32/test-assembler-cond-rd-pc-operand-imm12-t32.cc \
-  test/aarch32/test-assembler-cond-rd-pc-operand-imm8-t32.cc \
-  test/aarch32/test-assembler-cond-rd-rn-a32.cc \
-  test/aarch32/test-assembler-cond-rd-rn-operand-const-a32.cc \
-  test/aarch32/test-assembler-cond-rd-rn-operand-const-t32.cc \
-  test/aarch32/test-assembler-cond-rd-rn-operand-imm12-t32.cc \
-  test/aarch32/test-assembler-cond-rd-rn-operand-rm-a32.cc \
-  test/aarch32/test-assembler-cond-rd-rn-operand-rm-ror-amount-a32.cc \
-  test/aarch32/test-assembler-cond-rd-rn-operand-rm-ror-amount-t32.cc \
-  test/aarch32/test-assembler-cond-rd-rn-operand-rm-shift-amount-1to31-a32.cc \
-  test/aarch32/test-assembler-cond-rd-rn-operand-rm-shift-amount-1to31-t32.cc \
-  test/aarch32/test-assembler-cond-rd-rn-operand-rm-shift-amount-1to32-a32.cc \
-  test/aarch32/test-assembler-cond-rd-rn-operand-rm-shift-amount-1to32-t32.cc \
-  test/aarch32/test-assembler-cond-rd-rn-operand-rm-shift-rs-a32.cc \
-  test/aarch32/test-assembler-cond-rd-rn-operand-rm-t32-all-low-in-it-block.cc \
-  test/aarch32/test-assembler-cond-rd-rn-operand-rm-t32-all-low-rd-is-rn-in-it-block.cc \
-  test/aarch32/test-assembler-cond-rd-rn-operand-rm-t32-rd-is-rn-in-it-block.cc \
-  test/aarch32/test-assembler-cond-rd-rn-operand-rm-t32-rd-is-rn-is-sp-in-it-block.cc \
-  test/aarch32/test-assembler-cond-rd-rn-operand-rm-t32-rn-is-sp-in-it-block.cc \
-  test/aarch32/test-assembler-cond-rd-rn-operand-rm-t32.cc \
-  test/aarch32/test-assembler-cond-rd-rn-rm-a32.cc \
-  test/aarch32/test-assembler-cond-rd-rn-rm-t32.cc \
-  test/aarch32/test-assembler-cond-rd-rn-t32.cc \
-  test/aarch32/test-assembler-cond-rd-sp-operand-imm8-t32.cc \
-  test/aarch32/test-assembler-cond-rdlow-operand-imm8-t32-in-it-block.cc \
-  test/aarch32/test-assembler-cond-rdlow-operand-imm8-t32.cc \
-  test/aarch32/test-assembler-cond-rdlow-rnlow-operand-immediate-t32-imm3-in-it-block.cc \
-  test/aarch32/test-assembler-cond-rdlow-rnlow-operand-immediate-t32-imm3.cc \
-  test/aarch32/test-assembler-cond-rdlow-rnlow-operand-immediate-t32-imm8-in-it-block.cc \
-  test/aarch32/test-assembler-cond-rdlow-rnlow-operand-immediate-t32-imm8.cc \
-  test/aarch32/test-assembler-cond-rdlow-rnlow-operand-immediate-t32-zero-in-it-block.cc \
-  test/aarch32/test-assembler-cond-rdlow-rnlow-operand-immediate-t32-zero.cc \
-  test/aarch32/test-assembler-cond-rdlow-rnlow-rmlow-t32-in-it-block.cc \
-  test/aarch32/test-assembler-cond-rdlow-rnlow-rmlow-t32.cc \
-  test/aarch32/test-assembler-cond-sp-sp-operand-imm7-t32.cc \
-  test/aarch32/test-assembler-rd-rn-rm-a32.cc \
-  test/aarch32/test-assembler-rd-rn-rm-t32.cc \
-  test/aarch32/test-disasm-a32.cc \
-  test/aarch32/test-simulator-cond-rd-memop-immediate-512-a32.cc \
-  test/aarch32/test-simulator-cond-rd-memop-immediate-8192-a32.cc \
-  test/aarch32/test-simulator-cond-rd-memop-rs-a32.cc \
-  test/aarch32/test-simulator-cond-rd-memop-rs-shift-amount-1to31-a32.cc \
-  test/aarch32/test-simulator-cond-rd-memop-rs-shift-amount-1to32-a32.cc \
-  test/aarch32/test-simulator-cond-rd-operand-const-a32.cc \
-  test/aarch32/test-simulator-cond-rd-operand-const-t32.cc \
-  test/aarch32/test-simulator-cond-rd-operand-imm16-t32.cc \
-  test/aarch32/test-simulator-cond-rd-operand-rn-a32.cc \
-  test/aarch32/test-simulator-cond-rd-operand-rn-ror-amount-a32.cc \
-  test/aarch32/test-simulator-cond-rd-operand-rn-ror-amount-t32.cc \
-  test/aarch32/test-simulator-cond-rd-operand-rn-shift-amount-1to31-a32.cc \
-  test/aarch32/test-simulator-cond-rd-operand-rn-shift-amount-1to31-t32.cc \
-  test/aarch32/test-simulator-cond-rd-operand-rn-shift-amount-1to32-a32.cc \
-  test/aarch32/test-simulator-cond-rd-operand-rn-shift-amount-1to32-t32.cc \
-  test/aarch32/test-simulator-cond-rd-operand-rn-shift-rs-a32.cc \
-  test/aarch32/test-simulator-cond-rd-operand-rn-shift-rs-t32.cc \
-  test/aarch32/test-simulator-cond-rd-operand-rn-t32.cc \
-  test/aarch32/test-simulator-cond-rd-rn-a32.cc \
-  test/aarch32/test-simulator-cond-rd-rn-operand-const-a32.cc \
-  test/aarch32/test-simulator-cond-rd-rn-operand-const-t32.cc \
-  test/aarch32/test-simulator-cond-rd-rn-operand-imm12-t32.cc \
-  test/aarch32/test-simulator-cond-rd-rn-operand-rm-a32.cc \
-  test/aarch32/test-simulator-cond-rd-rn-operand-rm-ror-amount-a32.cc \
-  test/aarch32/test-simulator-cond-rd-rn-operand-rm-ror-amount-t32.cc \
-  test/aarch32/test-simulator-cond-rd-rn-operand-rm-shift-amount-1to31-a32.cc \
-  test/aarch32/test-simulator-cond-rd-rn-operand-rm-shift-amount-1to31-t32.cc \
-  test/aarch32/test-simulator-cond-rd-rn-operand-rm-shift-amount-1to32-a32.cc \
-  test/aarch32/test-simulator-cond-rd-rn-operand-rm-shift-amount-1to32-t32.cc \
-  test/aarch32/test-simulator-cond-rd-rn-operand-rm-shift-rs-a32.cc \
-  test/aarch32/test-simulator-cond-rd-rn-operand-rm-t32.cc \
-  test/aarch32/test-simulator-cond-rd-rn-rm-a32-ge.cc \
-  test/aarch32/test-simulator-cond-rd-rn-rm-a32-q.cc \
-  test/aarch32/test-simulator-cond-rd-rn-rm-a32-sel.cc \
-  test/aarch32/test-simulator-cond-rd-rn-rm-a32.cc \
-  test/aarch32/test-simulator-cond-rd-rn-rm-t32-ge.cc \
-  test/aarch32/test-simulator-cond-rd-rn-rm-t32-q.cc \
-  test/aarch32/test-simulator-cond-rd-rn-rm-t32-sel.cc \
-  test/aarch32/test-simulator-cond-rd-rn-rm-t32.cc \
-  test/aarch32/test-simulator-cond-rd-rn-t32.cc \
-  test/aarch32/test-simulator-cond-rdlow-operand-imm8-t32.cc \
-  test/aarch32/test-simulator-cond-rdlow-rnlow-operand-immediate-t32.cc \
-  test/aarch32/test-simulator-cond-rdlow-rnlow-rmlow-t32.cc \
-  test/aarch32/test-simulator-rd-rn-rm-a32.cc \
-  test/aarch32/test-simulator-rd-rn-rm-t32.cc \
-  test/aarch32/test-utils-aarch32.cc \
-  test/aarch64/test-abi.cc \
-  test/aarch64/test-assembler-aarch64.cc \
-  test/aarch64/test-disasm-aarch64.cc \
-  test/aarch64/test-fuzz-aarch64.cc \
-  test/aarch64/test-simulator-aarch64.cc \
-  test/aarch64/test-trace-aarch64.cc \
-  test/aarch64/test-utils-aarch64.cc \
-  test/test-invalset.cc \
-  test/test-runner.cc \
-  test/test-utils.cc
-
-vixl_cpp_flags := \
-  -DVIXL_GENERATE_SIMULATOR_INSTRUCTIONS_VALUE=0 \
-  -Wall \
-  -Wextra \
-  -Werror \
-  -fdiagnostics-show-option \
-  -Wredundant-decls \
-  -Wunreachable-code \
-  -Wmissing-noreturn \
-  -pedantic \
-  -std=c++11 \
-
-# Explicitly enable the write-strings warning. VIXL uses
-# const correctly when handling string constants.
-vixl_cpp_flags += \
-  -Wwrite-strings \
-
-vixl_cpp_flags_release := \
-  $(vixl_cpp_flags) \
-  -O3 \
-
-vixl_cpp_flags_debug := \
-  $(vixl_cpp_flags) \
-  -DVIXL_DEBUG \
-  -UNDEBUG \
-  -O2 \
-  -ggdb3 \
-
-VIXL_COVERAGE := false
-
-ifeq ($(ART_COVERAGE), true)
-  VIXL_COVERAGE := true
-endif
-
-# Shared libraries for target - arm64
-include $(CLEAR_VARS)
-LOCAL_CLANG := true
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_CPPFLAGS := $(vixl_cpp_flags_release) -DVIXL_INCLUDE_SIMULATOR
-LOCAL_CLANG_CFLAGS := -Wimplicit-fallthrough
-LOCAL_C_INCLUDES := $(vixl_src_include_path)
-LOCAL_SRC_FILES :=  $(vixl_common_files) $(vixl_src_files_arm64)
-LOCAL_SHARED_LIBRARIES := liblog
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libvixl-arm64
-LOCAL_SANITIZE_RECOVER := shift-exponent
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_CLANG := true
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_CPPFLAGS := $(vixl_cpp_flags_debug) -DVIXL_INCLUDE_SIMULATOR
-LOCAL_CLANG_CFLAGS := -Wimplicit-fallthrough
-LOCAL_C_INCLUDES := $(vixl_src_include_path)
-LOCAL_SRC_FILES :=  $(vixl_common_files) $(vixl_src_files_arm64)
-LOCAL_SHARED_LIBRARIES := liblog
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libvixld-arm64
-LOCAL_SANITIZE_RECOVER := shift-exponent
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-include $(BUILD_SHARED_LIBRARY)
-
-# Shared libraries for host - arm64
-include $(CLEAR_VARS)
-LOCAL_CLANG := true
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_CPPFLAGS := $(vixl_cpp_flags_release) -DVIXL_INCLUDE_SIMULATOR
-LOCAL_CLANG_CFLAGS := -Wimplicit-fallthrough
-LOCAL_NATIVE_COVERAGE := $(VIXL_COVERAGE)
-LOCAL_C_INCLUDES := $(vixl_src_include_path)
-LOCAL_SRC_FILES :=  $(vixl_common_files) $(vixl_src_files_arm64)
-LOCAL_SHARED_LIBRARIES := liblog
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libvixl-arm64
-LOCAL_SANITIZE_RECOVER := shift-exponent
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_MULTILIB := both
-include $(BUILD_HOST_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_CLANG := true
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_CPPFLAGS := $(vixl_cpp_flags_debug) -DVIXL_INCLUDE_SIMULATOR
-LOCAL_CLANG_CFLAGS := -Wimplicit-fallthrough
-LOCAL_NATIVE_COVERAGE := $(VIXL_COVERAGE)
-LOCAL_C_INCLUDES := $(vixl_src_include_path)
-LOCAL_SRC_FILES :=  $(vixl_common_files) $(vixl_src_files_arm64)
-LOCAL_SHARED_LIBRARIES := liblog
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libvixld-arm64
-LOCAL_SANITIZE_RECOVER := shift-exponent
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_MULTILIB := both
-include $(BUILD_HOST_SHARED_LIBRARY)
-
-# Static libraries for host - arm64
-include $(CLEAR_VARS)
-LOCAL_CLANG := true
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_CPPFLAGS := $(vixl_cpp_flags_release) -DVIXL_INCLUDE_SIMULATOR
-LOCAL_CLANG_CFLAGS := -Wimplicit-fallthrough
-LOCAL_NATIVE_COVERAGE := $(VIXL_COVERAGE)
-LOCAL_C_INCLUDES := $(vixl_src_include_path)
-LOCAL_SRC_FILES :=  $(vixl_common_files) $(vixl_src_files_arm64)
-LOCAL_STATIC_LIBRARIES := liblog
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libvixl-arm64
-LOCAL_SANITIZE_RECOVER := shift-exponent
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_MULTILIB := both
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_CLANG := true
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_CPPFLAGS := $(vixl_cpp_flags_debug) -DVIXL_INCLUDE_SIMULATOR
-LOCAL_CLANG_CFLAGS := -Wimplicit-fallthrough
-LOCAL_NATIVE_COVERAGE := $(VIXL_COVERAGE)
-LOCAL_C_INCLUDES := $(vixl_src_include_path)
-LOCAL_SRC_FILES :=  $(vixl_common_files) $(vixl_src_files_arm64)
-LOCAL_STATIC_LIBRARIES := liblog
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libvixld-arm64
-LOCAL_SANITIZE_RECOVER := shift-exponent
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_MULTILIB := both
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-# Shared libraries for target - arm
-include $(CLEAR_VARS)
-LOCAL_CLANG := true
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_CPPFLAGS := $(vixl_cpp_flags_release)
-LOCAL_CLANG_CFLAGS := -Wimplicit-fallthrough
-LOCAL_C_INCLUDES := $(vixl_src_include_path)
-LOCAL_SRC_FILES :=  $(vixl_common_files) $(vixl_src_files_arm)
-LOCAL_SHARED_LIBRARIES := liblog
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libvixl-arm
-LOCAL_SANITIZE_RECOVER := shift-exponent
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_CLANG := true
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_CPPFLAGS := $(vixl_cpp_flags_debug)
-LOCAL_CLANG_CFLAGS := -Wimplicit-fallthrough
-LOCAL_C_INCLUDES := $(vixl_src_include_path)
-LOCAL_SRC_FILES :=  $(vixl_common_files) $(vixl_src_files_arm)
-LOCAL_SHARED_LIBRARIES := liblog
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libvixld-arm
-LOCAL_SANITIZE_RECOVER := shift-exponent
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-include $(BUILD_SHARED_LIBRARY)
-
-# Shared libraries for host - arm
-include $(CLEAR_VARS)
-LOCAL_CLANG := true
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_CPPFLAGS := $(vixl_cpp_flags_release)
-LOCAL_CLANG_CFLAGS := -Wimplicit-fallthrough
-LOCAL_NATIVE_COVERAGE := $(VIXL_COVERAGE)
-LOCAL_C_INCLUDES := $(vixl_src_include_path)
-LOCAL_SRC_FILES :=  $(vixl_common_files) $(vixl_src_files_arm)
-LOCAL_SHARED_LIBRARIES := liblog
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libvixl-arm
-LOCAL_SANITIZE_RECOVER := shift-exponent
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_MULTILIB := both
-include $(BUILD_HOST_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_CLANG := true
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_CPPFLAGS := $(vixl_cpp_flags_debug)
-LOCAL_CLANG_CFLAGS := -Wimplicit-fallthrough
-LOCAL_NATIVE_COVERAGE := $(VIXL_COVERAGE)
-LOCAL_C_INCLUDES := $(vixl_src_include_path)
-LOCAL_SRC_FILES :=  $(vixl_common_files) $(vixl_src_files_arm)
-LOCAL_SHARED_LIBRARIES := liblog
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libvixld-arm
-LOCAL_SANITIZE_RECOVER := shift-exponent
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_MULTILIB := both
-include $(BUILD_HOST_SHARED_LIBRARY)
-
-# Static libraries for host - arm
-include $(CLEAR_VARS)
-LOCAL_CLANG := true
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_CPPFLAGS := $(vixl_cpp_flags_release)
-LOCAL_CLANG_CFLAGS := -Wimplicit-fallthrough
-LOCAL_NATIVE_COVERAGE := $(VIXL_COVERAGE)
-LOCAL_C_INCLUDES := $(vixl_src_include_path)
-LOCAL_SRC_FILES :=  $(vixl_common_files) $(vixl_src_files_arm)
-LOCAL_STATIC_LIBRARIES := liblog
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libvixl-arm
-LOCAL_SANITIZE_RECOVER := shift-exponent
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_MULTILIB := both
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_CLANG := true
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_CPPFLAGS := $(vixl_cpp_flags_debug)
-LOCAL_CLANG_CFLAGS := -Wimplicit-fallthrough
-LOCAL_NATIVE_COVERAGE := $(VIXL_COVERAGE)
-LOCAL_C_INCLUDES := $(vixl_src_include_path)
-LOCAL_SRC_FILES :=  $(vixl_common_files) $(vixl_src_files_arm)
-LOCAL_STATIC_LIBRARIES := liblog
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libvixld-arm
-LOCAL_SANITIZE_RECOVER := shift-exponent
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_MULTILIB := both
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-
-######### VIXL HOST TESTS #########
-#
-# We only support 64bit host builds for now.
-# To run all the tests: vixl-test-runner --run_all
-#
-include $(CLEAR_VARS)
-LOCAL_CLANG := true
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_CPPFLAGS := $(vixl_cpp_flags_debug) -DVIXL_INCLUDE_SIMULATOR
-LOCAL_CLANG_CFLAGS := -Wimplicit-fallthrough
-LOCAL_NATIVE_COVERAGE := $(VIXL_COVERAGE)
-LOCAL_C_INCLUDES := $(vixl_test_include_path)
-LOCAL_SRC_FILES :=  $(vixl_test_files) $(vixl_common_files) $(vixl_src_files_arm) $(vixl_src_files_arm64)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_HOST_ARCH := x86_64
-LOCAL_FORCE_STATIC_EXECUTABLE := true
-LOCAL_MODULE := vixl-test-runner
-LOCAL_SANITIZE_RECOVER := shift-exponent
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-include $(BUILD_HOST_EXECUTABLE)
-
+vixl_root := $(LOCAL_PATH)
 vixl_host_out := $(if $(ANDROID_HOST_OUT), $(ANDROID_HOST_OUT), ../../$(HOST_OUT))
 
 .PHONY: run-vixl-tests
 run-vixl-tests: vixl-test-runner
-	$(vixl_root)/third_party/android/check_top_level_android_mk.sh
 	# TODO: Once available, use the appropriate option of vixl-test-runner
 	# to point to the trace files instead of running from the vixl root.
 	cd $(vixl_root) && $(vixl_host_out)/bin/vixl-test-runner --run_all