Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / native_client_sdk / src / resources / Makefile.example.template

diff --git a/src/native_client_sdk/src/resources/Makefile.example.template b/src/native_client_sdk/src/resources/Makefile.example.template
index 940c714..73f3996 100644 (file)
--- a/src/native_client_sdk/src/resources/Makefile.example.template
+++ b/src/native_client_sdk/src/resources/Makefile.example.template
@@ -34,6 +34,12 @@ NACL_SDK_ROOT ?= $(abspath $(CURDIR)/{{rel_sdk}})
 EXTRA_INC_PATHS={{' '.join(targets[0]['INCLUDES'])}}
 [[]]
 
+[[if multi_platform:]]
+# Build with platform-specific subdirectories, to reduce the download size of
+# the app.
+MULTI_PLATFORM = 1
+[[]]
+
 include $(NACL_SDK_ROOT)/tools/common.mk
 
 [[if desc.get('SOCKET_PERMISSIONS'):]]
@@ -96,7 +102,9 @@ $(eval $(call SO_RULE,{{name}},$({{sources}})))
 [[  elif target['TYPE'] == 'so-standalone':]]
 $(eval $(call SO_RULE,{{name}},$({{sources}}),,,1))
 [[  else:]]
-ifeq ($(CONFIG),Release)
+# The PNaCl workflow uses both an unstripped and finalized/stripped binary.
+# On NaCl, only produce a stripped binary for Release configs (not Debug).
+ifneq (,$(or $(findstring pnacl,$(TOOLCHAIN)),$(findstring Release,$(CONFIG))))
 $(eval $(call LINK_RULE,{{name}}_unstripped,$({{sources}}),$(LIBS),$(DEPS)))
 $(eval $(call STRIP_RULE,{{name}},{{name}}_unstripped))
 else