Merge from Chromium at DEPS revision 237746
This commit was generated by merge_to_master.py.
Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
diff --git a/sdch/sdch.target.darwin-arm.mk b/sdch/sdch.target.darwin-arm.mk
index 25783e7..125bb4b 100644
--- a/sdch/sdch.target.darwin-arm.mk
+++ b/sdch/sdch.target.darwin-arm.mk
@@ -30,7 +30,6 @@
sdch/open-vcdiff/src/encodetable.cc \
sdch/open-vcdiff/src/headerparser.cc \
sdch/open-vcdiff/src/instruction_map.cc \
- sdch/open-vcdiff/src/logging.cc \
sdch/open-vcdiff/src/varint_bigendian.cc \
sdch/open-vcdiff/src/vcdecoder.cc \
sdch/open-vcdiff/src/vcdiffengine.cc
@@ -49,6 +48,8 @@
-fvisibility=hidden \
-pipe \
-fPIC \
+ -include \
+ ./sdch/logging_forward.h \
-fno-tree-sra \
-fuse-ld=gold \
-Wno-psabi \
@@ -83,6 +84,7 @@
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_MANAGED_USERS=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -97,8 +99,10 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/sdch/open-vcdiff/src \
$(LOCAL_PATH)/sdch/linux \
+ $(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/zlib \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -130,6 +134,8 @@
-fvisibility=hidden \
-pipe \
-fPIC \
+ -include \
+ ./sdch/logging_forward.h \
-fno-tree-sra \
-fuse-ld=gold \
-Wno-psabi \
@@ -164,6 +170,7 @@
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_MANAGED_USERS=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -179,8 +186,10 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/sdch/open-vcdiff/src \
$(LOCAL_PATH)/sdch/linux \
+ $(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/zlib \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \