diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-10 11:40:50 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-10 11:40:50 +0100 |
| commit | eb525c5499e34cc9c4b825d6d9e75bb07cc06ace (patch) | |
| tree | d908ce4bfe1717d2cd53f41327d8b9ba8304355f /GypAndroid.darwin-arm.mk | |
| parent | 3c54152607de4272b3da0c146b71dcba8a0e5610 (diff) | |
| download | chromium_org-eb525c5499e34cc9c4b825d6d9e75bb07cc06ace.tar.gz | |
Merge from Chromium at DEPS revision r210036
This commit was generated by merge_to_master.py.
Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
Diffstat (limited to 'GypAndroid.darwin-arm.mk')
| -rw-r--r-- | GypAndroid.darwin-arm.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/GypAndroid.darwin-arm.mk b/GypAndroid.darwin-arm.mk index 1a82330fe4..d2b624b3c6 100644 --- a/GypAndroid.darwin-arm.mk +++ b/GypAndroid.darwin-arm.mk @@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir) -GYP_DEFAULT_CONFIGURATION := Debug +GYP_CONFIGURATION ?= Debug include $(LOCAL_PATH)/android_webview/All.target.darwin-arm.mk include $(LOCAL_PATH)/android_webview/android_webview_common.target.darwin-arm.mk @@ -21,12 +21,12 @@ include $(LOCAL_PATH)/base/base_prefs.target.darwin-arm.mk include $(LOCAL_PATH)/base/base_static.target.darwin-arm.mk include $(LOCAL_PATH)/base/symbolize.target.darwin-arm.mk include $(LOCAL_PATH)/base/third_party/dynamic_annotations/dynamic_annotations.target.darwin-arm.mk -include $(LOCAL_PATH)/build/temp_gyp/googleurl.target.darwin-arm.mk include $(LOCAL_PATH)/cc/cc.target.darwin-arm.mk include $(LOCAL_PATH)/components/auto_login_parser.target.darwin-arm.mk -include $(LOCAL_PATH)/components/autofill_browser.target.darwin-arm.mk include $(LOCAL_PATH)/components/autofill_content_browser.target.darwin-arm.mk +include $(LOCAL_PATH)/components/autofill_content_renderer.target.darwin-arm.mk include $(LOCAL_PATH)/components/autofill_content_risk_proto.target.darwin-arm.mk +include $(LOCAL_PATH)/components/autofill_core_browser.target.darwin-arm.mk include $(LOCAL_PATH)/components/autofill_core_common.target.darwin-arm.mk include $(LOCAL_PATH)/components/autofill_jni_headers.target.darwin-arm.mk include $(LOCAL_PATH)/components/autofill_regexes.target.darwin-arm.mk |