diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-06-25 10:30:53 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-06-25 10:30:53 +0100 |
| commit | 6d86b77056ed63eb6871182f42a9fd5f07550f90 (patch) | |
| tree | 4bd56255660f52e406fbd45083c006cd6ddb2877 /GypAndroid.darwin-arm64.mk | |
| parent | e9f930807da3850e29ecc641d2becc0403b5709c (diff) | |
| download | chromium_org-6d86b77056ed63eb6871182f42a9fd5f07550f90.tar.gz | |
Merge from Chromium at DEPS revision 278856
This commit was generated by merge_to_master.py.
Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3
Diffstat (limited to 'GypAndroid.darwin-arm64.mk')
| -rw-r--r-- | GypAndroid.darwin-arm64.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/GypAndroid.darwin-arm64.mk b/GypAndroid.darwin-arm64.mk index a1eb6dc776..b7843d8297 100644 --- a/GypAndroid.darwin-arm64.mk +++ b/GypAndroid.darwin-arm64.mk @@ -8,8 +8,10 @@ GYP_HOST_VAR_PREFIX ?= GYP_HOST_MULTILIB ?= include $(LOCAL_PATH)/android_webview/android_webview_common.target.darwin-arm64.mk +include $(LOCAL_PATH)/android_webview/android_webview_jarjar_content_resources.target.darwin-arm64.mk +include $(LOCAL_PATH)/android_webview/android_webview_jarjar_ui_resources.target.darwin-arm64.mk include $(LOCAL_PATH)/android_webview/android_webview_pak.target.darwin-arm64.mk -include $(LOCAL_PATH)/android_webview/android_webview_strings.target.darwin-arm64.mk +include $(LOCAL_PATH)/android_webview/android_webview_resources.target.darwin-arm64.mk include $(LOCAL_PATH)/android_webview/libwebviewchromium.target.darwin-arm64.mk include $(LOCAL_PATH)/android_webview/native/android_webview_native_jni.target.darwin-arm64.mk include $(LOCAL_PATH)/android_webview/native/cancellation_signal_android_jar_jni_headers.target.darwin-arm64.mk |