diff options
| -rw-r--r-- | core/config.mk | 8 | ||||
| -rw-r--r-- | target/board/generic_x86_arm/BoardConfig.mk | 12 |
2 files changed, 5 insertions, 15 deletions
diff --git a/core/config.mk b/core/config.mk index 1d1aa6abc5..df56edb6cd 100644 --- a/core/config.mk +++ b/core/config.mk @@ -119,6 +119,7 @@ $(KATI_obsolete_var \ ARCH_X86_HAVE_SSSE3 \ ) $(KATI_obsolete_var PRODUCT_IOT) +$(KATI_obsolete_var MD5SUM) # Used to force goals to build. Only use for conditionally defined goals. .PHONY: FORCE @@ -648,13 +649,6 @@ endif # Path to tools.jar HOST_JDK_TOOLS_JAR := $(ANDROID_JAVA8_HOME)/lib/tools.jar -# It's called md5 on Mac OS and md5sum on Linux -ifeq ($(HOST_OS),darwin) -MD5SUM:=md5 -q -else -MD5SUM:=md5sum -endif - APICHECK_COMMAND := $(JAVA) -Xmx4g -jar $(APICHECK) --no-banner --compatible-output=yes # Boolean variable determining if the whitelist for compatible properties is enabled diff --git a/target/board/generic_x86_arm/BoardConfig.mk b/target/board/generic_x86_arm/BoardConfig.mk index 6fae4113c1..e879001580 100644 --- a/target/board/generic_x86_arm/BoardConfig.mk +++ b/target/board/generic_x86_arm/BoardConfig.mk @@ -18,14 +18,10 @@ TARGET_CPU_ABI := x86 TARGET_ARCH := x86 TARGET_ARCH_VARIANT := x86 -TARGET_2ND_ARCH := arm -TARGET_2ND_CPU_ABI := armeabi-v7a -TARGET_2ND_CPU_ABI2 := armeabi -TARGET_2ND_ARCH_VARIANT := armv7-a-neon -TARGET_2ND_CPU_VARIANT := generic - -TARGET_CPU_ABI_LIST := x86 armeabi-v7a armeabi -TARGET_TRANSLATE_2ND_ARCH := true +TARGET_NATIVE_BRIDGE_ARCH := arm +TARGET_NATIVE_BRIDGE_ARCH_VARIANT := armv7-a-neon +TARGET_NATIVE_BRIDGE_CPU_VARIANT := generic +TARGET_NATIVE_BRIDGE_ABI := armeabi-v7a armeabi BUILD_BROKEN_DUP_RULES := true |