shithub: openh264

Download patch

ref: 4edc5f60a11216729cfc099e500186a0198e2635
parent: 7bb422803db7bef9a12403f5b29e0a90dc7fc7cf
parent: 6bf65da869aa5e08f564d7ccd3aee9fc939b4af6
author: ruil2 <[email protected]>
date: Thu Jul 10 05:31:57 EDT 2014 

Merge pull request #1126 from mstorsjo/android-simplify

Avoid repeated code for getting the android toolchain prefix


--- a/build/platform-android.mk
+++ b/build/platform-android.mk
@@ -9,19 +9,16 @@
     LDFLAGS += -march=armv7-a -Wl,--fix-cortex-a8
     APP_ABI = armeabi-v7a
   endif
-    TOOLCHAINPREFIX = $(shell NDK_PROJECT_PATH=./codec/build/android/dec make --no-print-dir -f $(NDKROOT)/build/core/build-local.mk DUMP_TOOLCHAIN_PREFIX APP_ABI=armeabi)
   ifeq (Yes, $(USE_ASM))
     ASMFLAGS += -march=armv7-a -mfpu=neon
   endif
 else ifeq ($(ARCH), x86)
     APP_ABI = x86
-    TOOLCHAINPREFIX = $(shell NDK_PROJECT_PATH=./codec/build/android/dec make --no-print-dir -f $(NDKROOT)/build/core/build-local.mk DUMP_TOOLCHAIN_PREFIX APP_ABI=x86)
   ifeq (Yes, $(USE_ASM))
     ASMFLAGS += -f elf32
   endif
 else
     APP_ABI = $(ARCH)
-    TOOLCHAINPREFIX = $(shell NDK_PROJECT_PATH=./codec/build/android/dec make --no-print-dir -f $(NDKROOT)/build/core/build-local.mk DUMP_TOOLCHAIN_PREFIX APP_ABI=$(APP_ABI))
 endif
 
 ifndef NDKROOT
@@ -30,6 +27,8 @@
 ifndef TARGET
 $(error TARGET is not set)
 endif
+
+TOOLCHAINPREFIX = $(shell NDK_PROJECT_PATH=./codec/build/android/dec make --no-print-dir -f $(NDKROOT)/build/core/build-local.mk DUMP_TOOLCHAIN_PREFIX APP_ABI=$(APP_ABI))
 
 SYSROOT = $(NDKROOT)/platforms/android-$(NDKLEVEL)/arch-$(ARCH)
 CXX = $(TOOLCHAINPREFIX)g++