diff options
| author | Ben Murdoch <benm@google.com> | 2014-03-31 11:51:25 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-03-31 11:51:25 +0100 |
| commit | effb81e5f8246d0db0270817048dc992db66e9fb (patch) | |
| tree | cc45ced7dfde038c8f3d022ee1eeac207a68761e /GypAndroid.linux-arm.mk | |
| parent | 4d26337013537c1acafbcb63b9b2b7e404c3adc9 (diff) | |
| download | chromium_org-effb81e5f8246d0db0270817048dc992db66e9fb.tar.gz | |
Merge from Chromium at DEPS revision 260458
This commit was generated by merge_to_master.py.
Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
Diffstat (limited to 'GypAndroid.linux-arm.mk')
| -rw-r--r-- | GypAndroid.linux-arm.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/GypAndroid.linux-arm.mk b/GypAndroid.linux-arm.mk index 60fb9ffb3e..b79df8980b 100644 --- a/GypAndroid.linux-arm.mk +++ b/GypAndroid.linux-arm.mk @@ -65,6 +65,7 @@ include $(LOCAL_PATH)/content/result_codes_java.target.linux-arm.mk include $(LOCAL_PATH)/content/screen_orientation_values_java.target.linux-arm.mk include $(LOCAL_PATH)/content/speech_recognition_error_java.target.linux-arm.mk include $(LOCAL_PATH)/content/webkit_version.target.linux-arm.mk +include $(LOCAL_PATH)/courgette/courgette_lib.target.linux-arm.mk include $(LOCAL_PATH)/crypto/crypto.target.linux-arm.mk include $(LOCAL_PATH)/gin/gin.target.linux-arm.mk include $(LOCAL_PATH)/google_apis/google_apis.target.linux-arm.mk @@ -208,6 +209,7 @@ include $(LOCAL_PATH)/third_party/libwebp/libwebp_enc.target.linux-arm.mk include $(LOCAL_PATH)/third_party/libwebp/libwebp_utils.target.linux-arm.mk include $(LOCAL_PATH)/third_party/libxml/libxml.target.linux-arm.mk include $(LOCAL_PATH)/third_party/libxslt/libxslt.target.linux-arm.mk +include $(LOCAL_PATH)/third_party/lzma_sdk/lzma_sdk.target.linux-arm.mk include $(LOCAL_PATH)/third_party/mesa/mesa_headers.target.linux-arm.mk include $(LOCAL_PATH)/third_party/modp_b64/modp_b64.target.linux-arm.mk include $(LOCAL_PATH)/third_party/npapi/npapi.target.linux-arm.mk |