diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-04-25 13:39:26 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-04-25 13:39:26 +0100 |
| commit | cd268d937be2ea90bfc969315c5eeb9455314e6f (patch) | |
| tree | 62456c489f16ea433a5ff06eb8bc8c9ce62e8728 | |
| parent | 9fd69be73a96299c7658aa72fc02c4cca4c7b3ea (diff) | |
| download | chromium-libpac-cd268d937be2ea90bfc969315c5eeb9455314e6f.tar.gz | |
Update makefile dependencies on V8.idea133-weekly-release
Depend on V8 using the architecture-specific LOCAL_STATIC_LIBRARIES
variables instead of testing TARGET_ARCH. This will allow libpac to be
removed from the 64-bit blacklist.
arm64 is an unsupported target arch for now, because the WebView copy of
V8 is not yet being built for arm64. This can be removed once WebView's
V8 is building.
Bug: 12452053
Change-Id: Ib78f5213e618a3914a5d85777dfdf82bb791229a
| -rw-r--r-- | Android.mk | 26 |
1 files changed, 9 insertions, 17 deletions
@@ -20,25 +20,17 @@ LOCAL_CFLAGS += \ LOCAL_C_INCLUDES += $(LOCAL_PATH)/src external/chromium_org/v8 +# Temporarily disable arm64 as WebView isn't being built there yet. +LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH := arm64 + # Depend on V8 from WebView # DO NOT COPY without permission from WebView Owners -ifeq ($(TARGET_ARCH),x86_64) -LOCAL_STATIC_LIBRARIES := v8_tools_gyp_v8_base_ia32_gyp -else ifeq ($(TARGET_ARCH),x86) -LOCAL_STATIC_LIBRARIES := v8_tools_gyp_v8_base_ia32_gyp -else ifeq ($(TARGET_ARCH),arm64) -LOCAL_STATIC_LIBRARIES := v8_tools_gyp_v8_base_arm_gyp -else ifeq ($(TARGET_ARCH),arm) -LOCAL_STATIC_LIBRARIES := v8_tools_gyp_v8_base_arm_gyp -else ifeq ($(TARGET_ARCH),mips64) -LOCAL_STATIC_LIBRARIES := v8_tools_gyp_v8_base_mipsel_gyp -else ifeq ($(TARGET_ARCH),mips) -LOCAL_STATIC_LIBRARIES := v8_tools_gyp_v8_base_mipsel_gyp -else -$(error Unsupported TARGET_ARCH) -endif -LOCAL_STATIC_LIBRARIES += \ - v8_tools_gyp_v8_snapshot_gyp +LOCAL_STATIC_LIBRARIES_x86_64 := v8_tools_gyp_v8_base_x64_gyp +LOCAL_STATIC_LIBRARIES_x86 := v8_tools_gyp_v8_base_ia32_gyp +LOCAL_STATIC_LIBRARIES_arm64 := v8_tools_gyp_v8_base_arm64_gyp +LOCAL_STATIC_LIBRARIES_arm := v8_tools_gyp_v8_base_arm_gyp +LOCAL_STATIC_LIBRARIES_mips := v8_tools_gyp_v8_base_mipsel_gyp +LOCAL_STATIC_LIBRARIES := v8_tools_gyp_v8_snapshot_gyp LOCAL_SHARED_LIBRARIES := libutils libstlport liblog libicui18n libicuuc |