diff options
| author | Jason Monk <jmonk@google.com> | 2014-03-20 18:36:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-20 18:36:44 +0000 |
| commit | 14b63d828c66db01a1efcfad59bdafdd2b74a07c (patch) | |
| tree | af28f9d8d80a81ff7cdd6b1e91681110bda8fc1b | |
| parent | 4fc485ac1a0d3d4f338f036b7b6850b612186ec2 (diff) | |
| parent | bccc345cd25c00ced47f8f0138e8b266c1cd5e7d (diff) | |
| download | chromium-libpac-14b63d828c66db01a1efcfad59bdafdd2b74a07c.tar.gz | |
Merge "Revert "Fix build""
| -rw-r--r-- | Android.mk | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -22,23 +22,23 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/src external/chromium_org/v8 # Depend on V8 from WebView # DO NOT COPY without permission from WebView Owners +LOCAL_STATIC_LIBRARIES := \ + v8_tools_gyp_v8_snapshot_gyp ifeq ($(TARGET_ARCH),x86_64) -LOCAL_STATIC_LIBRARIES := v8_tools_gyp_v8_base_ia32_gyp +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 +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 +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 +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 +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 +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_SHARED_LIBRARIES := libutils libstlport liblog libicui18n libicuuc |