FEX-Emu/vixl
1
0
Fork 0
mirror of https://github.com/FEX-Emu/vixl.git synced 2024-11-23 14:40:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename targets in the Android makefile template

Browse Source 
aarch32 is now arm
aarch64 is now arm64

Change-Id: I0d1e159081c41fc3b65190eeb103ab90f04bfdf8
This commit is contained in:
Serban Constantinescu 2016-08-11 11:24:22 +01:00
parent e0b313e398
commit 60c79c5257
2 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
third_party/android/Android.mk.template vendored
View File

@ -65,11 +65,11 @@ vixl_test_include_path := $(vixl_src_include_path) $(vixl_root)/test/
vixl_common_files := \
{vixl_common}
vixl_src_files_aarch32 := \
{vixl_aarch32_sources}
vixl_src_files_arm := \
{vixl_arm_sources}
vixl_src_files_aarch64 := \
{vixl_aarch64_sources}
vixl_src_files_arm64 := \
{vixl_arm64_sources}
vixl_test_files := \
{vixl_test_files}
@ -108,17 +108,17 @@ ifeq ($(ART_COVERAGE), true)
VIXL_COVERAGE := true
endif
# Shared libraries for target - aarch64
# 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_aarch64)
LOCAL_SRC_FILES := $(vixl_common_files) $(vixl_src_files_arm64)
LOCAL_SHARED_LIBRARIES := liblog
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libvixl-aarch64
LOCAL_MODULE := libvixl-arm64
LOCAL_SANITIZE_RECOVER := shift-exponent
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
include $(BUILD_SHARED_LIBRARY)
@ -129,15 +129,15 @@ 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_aarch64)
LOCAL_SRC_FILES := $(vixl_common_files) $(vixl_src_files_arm64)
LOCAL_SHARED_LIBRARIES := liblog
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libvixld-aarch64
LOCAL_MODULE := libvixld-arm64
LOCAL_SANITIZE_RECOVER := shift-exponent
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
include $(BUILD_SHARED_LIBRARY)
# Shared libraries for host - aarch64
# Shared libraries for host - arm64
include $(CLEAR_VARS)
LOCAL_CLANG := true
LOCAL_CPP_EXTENSION := .cc
@ -145,10 +145,10 @@ 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_aarch64)
LOCAL_SRC_FILES := $(vixl_common_files) $(vixl_src_files_arm64)
LOCAL_SHARED_LIBRARIES := liblog
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libvixl-aarch64
LOCAL_MODULE := libvixl-arm64
LOCAL_SANITIZE_RECOVER := shift-exponent
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_MULTILIB := both
@ -161,16 +161,16 @@ 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_aarch64)
LOCAL_SRC_FILES := $(vixl_common_files) $(vixl_src_files_arm64)
LOCAL_SHARED_LIBRARIES := liblog
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libvixld-aarch64
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 - aarch64
# Static libraries for host - arm64
include $(CLEAR_VARS)
LOCAL_CLANG := true
LOCAL_CPP_EXTENSION := .cc
@ -178,10 +178,10 @@ 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_aarch64)
LOCAL_SRC_FILES := $(vixl_common_files) $(vixl_src_files_arm64)
LOCAL_STATIC_LIBRARIES := liblog
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libvixl-aarch64
LOCAL_MODULE := libvixl-arm64
LOCAL_SANITIZE_RECOVER := shift-exponent
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_MULTILIB := both
@ -194,26 +194,26 @@ 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_aarch64)
LOCAL_SRC_FILES := $(vixl_common_files) $(vixl_src_files_arm64)
LOCAL_STATIC_LIBRARIES := liblog
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libvixld-aarch64
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 - aarch32
# 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_aarch32)
LOCAL_SRC_FILES := $(vixl_common_files) $(vixl_src_files_arm)
LOCAL_SHARED_LIBRARIES := liblog
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libvixl-aarch32
LOCAL_MODULE := libvixl-arm
LOCAL_SANITIZE_RECOVER := shift-exponent
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
include $(BUILD_SHARED_LIBRARY)
@ -224,15 +224,15 @@ 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_aarch32)
LOCAL_SRC_FILES := $(vixl_common_files) $(vixl_src_files_arm)
LOCAL_SHARED_LIBRARIES := liblog
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libvixld-aarch32
LOCAL_MODULE := libvixld-arm
LOCAL_SANITIZE_RECOVER := shift-exponent
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
include $(BUILD_SHARED_LIBRARY)
# Shared libraries for host - aarch32
# Shared libraries for host - arm
include $(CLEAR_VARS)
LOCAL_CLANG := true
LOCAL_CPP_EXTENSION := .cc
@ -240,10 +240,10 @@ 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_aarch32)
LOCAL_SRC_FILES := $(vixl_common_files) $(vixl_src_files_arm)
LOCAL_SHARED_LIBRARIES := liblog
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libvixl-aarch32
LOCAL_MODULE := libvixl-arm
LOCAL_SANITIZE_RECOVER := shift-exponent
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_MULTILIB := both
@ -256,16 +256,16 @@ 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_aarch32)
LOCAL_SRC_FILES := $(vixl_common_files) $(vixl_src_files_arm)
LOCAL_SHARED_LIBRARIES := liblog
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libvixld-aarch32
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 - aarch32
# Static libraries for host - arm
include $(CLEAR_VARS)
LOCAL_CLANG := true
LOCAL_CPP_EXTENSION := .cc
@ -273,10 +273,10 @@ 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_aarch32)
LOCAL_SRC_FILES := $(vixl_common_files) $(vixl_src_files_arm)
LOCAL_STATIC_LIBRARIES := liblog
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libvixl-aarch32
LOCAL_MODULE := libvixl-arm
LOCAL_SANITIZE_RECOVER := shift-exponent
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_MULTILIB := both
@ -289,10 +289,10 @@ 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_aarch32)
LOCAL_SRC_FILES := $(vixl_common_files) $(vixl_src_files_arm)
LOCAL_STATIC_LIBRARIES := liblog
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libvixld-aarch32
LOCAL_MODULE := libvixld-arm
LOCAL_SANITIZE_RECOVER := shift-exponent
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_MULTILIB := both
@ -311,7 +311,7 @@ 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_aarch32) $(vixl_src_files_aarch64)
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

4
third_party/android/generate_android_mk.py vendored
View File

@ -71,8 +71,8 @@ with open(android_mk_template, 'r') as template_file:
template = template.format(vixl_common=' \\\n '.join(common_sources),
vixl_aarch64_sources=' \\\n '.join(aarch64_sources),
vixl_aarch32_sources=' \\\n '.join(aarch32_sources),
vixl_arm_sources=' \\\n '.join(aarch32_sources),
vixl_arm64_sources=' \\\n '.join(aarch64_sources),
vixl_test_files=' \\\n '.join(test_sources))