Source release v3.0.0-0-g8d3792b-ce + third_party

Change-Id: I399e71ddfffcd436171d1c60283c63ab4658e0b1

platforms/global_config.gypi

@@ -1,72 +0,0 @@
-# Copyright 2013 Google Inc. All rights reserved.
-{
-  # Global place to define default variables.
-  # This file and the platform-specific gypi are included in every gyp file.
-
-  'variables': {
-    'company_name%': '"UndefinedCompanyName"',
-    'model_name%': '"UndefinedModelName"',
-    'architecture_name%': '"UndefinedArchitectureName"',
-    'device_name%': '"UndefinedDeviceName"',
-    'product_name%': '"UndefinedProductName"',
-    'buildinfo_data%': '"UndefinedBuildInfo"',
-    'oemcrypto_target%': '../oemcrypto/mock/oec_mock.gyp:oec_mock',
-    'oemcrypto_v8%': 'false',
-    'certificate_provision%': 'false',
-    'force_use_of_secure_buffers%': 'false',
-    'privacy_crypto_impl%': 'openssl',
-
-    # There are three protobuf configurations:
-    #
-    # 1) protobuf_lib_type == 'system'
-    # Use a system-wide installation of protobuf.
-    # Specify the protobuf library in protobuf_lib.
-    # Specify the path to protoc in protoc_dir.
-    #
-    # 2) protobuf_lib_type == 'target'
-    # Use an existing protobuf gyp target from your project.
-    # Specify the protobuf gyp file and target in protobuf_lib.
-    # Specify the protoc gyp file and target in protoc_host_target (optional).
-    # Specify the path to protoc in protoc_dir.
-    #
-    # 3) protobuf_lib_type == 'source'
-    # Build protobuf and protoc from source.
-    # Specify the path to the protobuf source in protobuf_lib.
-    # Make sure that a valid config.h for your target is in the source tree.
-    'protobuf_lib_type%': 'system',
-    'protobuf_lib%': '-lprotobuf',
-    'protoc_dir%': '/usr/bin',
-    'protoc_host_target%': 'dummy',
-  }, # end variables
-
-  'target_defaults': {
-    'configurations': {
-      'Debug': {
-        'defines': [
-          '_DEBUG',
-        ],
-      },
-      'Release': {
-        'defines': [
-          'NDEBUG',
-        ],
-      },
-    }, # end configurations
-    'target_conditions': [
-      ['_type=="static_library"', {
-        'standalone_static_library': 1,
-      }]
-    ], # end target_conditions
-    'defines': [
-      'PLATFORM_COMPANY_NAME_WV=<(company_name)',
-      'PLATFORM_MODEL_NAME_WV=<(model_name)',
-      'PLATFORM_ARCHITECTURE_NAME_WV=<(architecture_name)',
-      'PLATFORM_DEVICE_NAME_WV=<(device_name)',
-      'PLATFORM_PRODUCT_NAME_WV=<(product_name)',
-      'PLATFORM_BUILDINFO_WV=<(buildinfo_data)',
-      'PLATFORM_CERTIFICATE_PROV=<(certificate_provision)',
-      'PLATFORM_REQUIRES_SECURE_BUFFERS=<(force_use_of_secure_buffers)',
-      'PLATFORM_USES_CLEAR_BUFFERS=!<(force_use_of_secure_buffers)',
-    ], # end defines
-  }, # end target_defaults
-}

platforms/x86-64/settings.gypi

@@ -1,16 +1,9 @@
-# Copyright 2013 Google Inc. All rights reserved.
+# Copyright 2015 Google Inc. All rights reserved.
 {
   # Here you can override global gyp variables with platform-specific values.
-  # See global_config.gypi for a complete list of settings you can override.
+  # See cdm.gyp for a complete list of settings you can override.
   'variables': {
-    'certificate_provision': 'true',
-
-    'company_name': '"www"',
-    'model_name': '"www"',
-    'architecture_name': '"x86-64"',
-    'device_name': '"x86-64 Linux"',
-    'product_name': '"x86-64 cdm"',
-    'buildinfo_data': '"cdm_partner_2.0"',
+    #'oemcrypto_version': 9,
   }, # end variables
 
   # Here you can set platform-specific compiler settings.
@@ -27,6 +20,7 @@
 
     # These are flags passed to the compiler for C++ only.
     'cflags_cc': [
+      '-std=c++11',
     ],
 
     # These are flags passed to the linker.
@@ -78,6 +72,9 @@
           '-O0',
           '-g',
         ],
+        'defines': [
+          '_DEBUG',
+        ],
         'ldflags': [
           '-g',
         ],
@@ -86,6 +83,9 @@
         'cflags': [
           '-O2',
         ],
+        'defines': [
+          'NDEBUG',
+        ],
       },
     }, # end configurations
   }, # end target_defaults