From cb4fdd1fdaaf2c11d40d3aeb3d5f62127230a6cc Mon Sep 17 00:00:00 2001 From: Android Chromium Automerger Date: Mon, 16 Jun 2014 14:50:41 +0000 Subject: Update makefiles after merge of Chromium at 277428 This commit was generated by merge_from_chromium.py. Change-Id: I35c59b36614d836accbb543178393a6c061586f1 --- system_wrappers/source/cpu_features_android.target.linux-arm.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'system_wrappers/source/cpu_features_android.target.linux-arm.mk') diff --git a/system_wrappers/source/cpu_features_android.target.linux-arm.mk b/system_wrappers/source/cpu_features_android.target.linux-arm.mk index 087b03e7..ba1cce96 100644 --- a/system_wrappers/source/cpu_features_android.target.linux-arm.mk +++ b/system_wrappers/source/cpu_features_android.target.linux-arm.mk @@ -121,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ @@ -236,6 +237,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ -- cgit v1.2.3