diff options
| author | Jason Monk <jmonk@google.com> | 2014-03-20 18:13:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-20 18:13:08 +0000 |
| commit | 4fc485ac1a0d3d4f338f036b7b6850b612186ec2 (patch) | |
| tree | 72a28ae7ae8f7cd820549396930e505fb20ba2a0 | |
| parent | 2b019e95e30da4451abe4e084acf7b55de53a52d (diff) | |
| parent | 3a0514eb8bee1e1f6add1d87fc597e2d9dc31067 (diff) | |
| download | chromium-libpac-4fc485ac1a0d3d4f338f036b7b6850b612186ec2.tar.gz | |
Merge "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 |