diff options
| author | Jason Monk <jmonk@google.com> | 2014-03-18 11:55:59 -0400 |
|---|---|---|
| committer | Jason Monk <jmonk@google.com> | 2014-03-20 13:33:04 -0400 |
| commit | 2077bd69a8f7657d2615ff4f93cfa6e843c998c8 (patch) | |
| tree | af28f9d8d80a81ff7cdd6b1e91681110bda8fc1b /Android.mk | |
| parent | d917798ab30ff39fb0ee831143c5525658277a0d (diff) | |
| download | chromium-libpac-2077bd69a8f7657d2615ff4f93cfa6e843c998c8.tar.gz | |
Update chromium-libpac to use chromium_org/v8
This switches libpac to use external/chromium_org/v8 rather than the
out of date external/v8.
Unit Tests Passing: 17/17
Bug: 12452053
Change-Id: I6d4c84b0e1bbea9e87dbc86aedd2a293e579a857
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 27 |
1 files changed, 23 insertions, 4 deletions
@@ -18,10 +18,29 @@ LOCAL_CFLAGS += \ -Wno-format \ -Wno-unused-parameter \ -LOCAL_C_INCLUDES += $(LOCAL_PATH)/src external/v8 - -LOCAL_STATIC_LIBRARIES := libv8 -LOCAL_SHARED_LIBRARIES := libutils libstlport liblog +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 +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_SHARED_LIBRARIES := libutils libstlport liblog libicui18n libicuuc include external/stlport/libstlport.mk |