diff options
| author | Lajos Molnar <lajos@google.com> | 2015-04-16 18:52:36 -0700 |
|---|---|---|
| committer | Lajos Molnar <lajos@google.com> | 2015-04-16 18:54:32 -0700 |
| commit | 8a947018e3e721c99b0f548d28a922471d94365b (patch) | |
| tree | 90499285cce4aab3f020f6dd48d706f8c2497d9b | |
| parent | 91f9bc5c87b5bec88a08429e8fc3f9fb5b707a1d (diff) | |
| download | android_external_libmpeg2-8a947018e3e721c99b0f548d28a922471d94365b.tar.gz android_external_libmpeg2-8a947018e3e721c99b0f548d28a922471d94365b.tar.bz2 android_external_libmpeg2-8a947018e3e721c99b0f548d28a922471d94365b.zip | |
fix build issues with clang
Disable clang for assembly, and pass include paths to clang-assembly in a clang way
Change-Id: Id0e4f433cd0b7f28addf50b36e2bce29e7fba3a8
| -rw-r--r-- | decoder.arm.mk | 4 | ||||
| -rw-r--r-- | decoder.arm64.mk | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/decoder.arm.mk b/decoder.arm.mk index 6e02ce8..5f59681 100644 --- a/decoder.arm.mk +++ b/decoder.arm.mk @@ -20,3 +20,7 @@ endif LOCAL_SRC_FILES_arm += $(libmpeg2d_srcs_c_arm) $(libmpeg2d_srcs_asm_arm) LOCAL_C_INCLUDES_arm += $(libmpeg2d_inc_dir_arm) LOCAL_CFLAGS_arm += $(libmpeg2d_cflags_arm) + +# CLANG WORKAROUNDS +LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as +LOCAL_CLANG_ASFLAGS_arm += $(addprefix -Wa$(comma)-I,$(libmpeg2d_inc_dir_arm)) diff --git a/decoder.arm64.mk b/decoder.arm64.mk index f3a36e6..bcb6d55 100644 --- a/decoder.arm64.mk +++ b/decoder.arm64.mk @@ -24,8 +24,8 @@ endif LOCAL_SRC_FILES_arm64 += $(libmpeg2d_srcs_c_arm64) $(libmpeg2d_srcs_asm_arm64) LOCAL_C_INCLUDES_arm64 += $(libmpeg2d_inc_dir_arm64) - -comma := , -LOCAL_ASFLAGS_arm64 += $(addprefix -Wa$(comma)-I,$(libmpeg2d_inc_dir_arm64)) - LOCAL_CFLAGS_arm64 += $(libmpeg2d_cflags_arm64) + +# CLANG WORKAROUNDS +LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as +LOCAL_CLANG_ASFLAGS_arm64 += $(addprefix -Wa$(comma)-I,$(libmpeg2d_inc_dir_arm64)) |