Source release v2.1.1-0-738 + third_party libs

Change-Id: I76e298f8092951d4214c776d6bbcad6b763eb5b2

cdm/cdm_api_external.gyp

@@ -1,6 +1,6 @@
 # Copyright 2013 Google Inc. All Rights Reserved.
 #
-# Builds under the CDM ./build/build.py (target platform) build system
+# Builds under the CDM ./build.py (target platform) build system
 # Refer to the distribution package's README for details.
 #
 {
@@ -22,32 +22,18 @@
         '../core/test',
         '../oemcrypto/include',
       ],
-      'ldflags': [
-        '-L$(builddir_name)/$(BUILDTYPE)/lib.target',
-        '-L$(builddir_name)/$(BUILDTYPE)',
-        '-Wl,-rpath=$(builddir_name)/$(BUILDTYPE)/lib.target/',
-      ],
       'libraries': [
-        '$(builddir_name)/$(BUILDTYPE)/lib.target/libwvcdm_shared.so',
         '-lssl',
         '-lcrypto',
         '-lpthread',
         '-lprotobuf',
       ],
       'dependencies': [
+        'cdm_api_internal.gyp:<(cdm_target_name)',
         'test/gmock.gyp:gmock',
         'test/gmock.gyp:gmock_main',
         'test/gtest.gyp:gtest',
       ],
-      'conditions':  [
-        [ 'external_build==0',
-          {
-            'dependencies': [
-              '../cdm/cdm_api_internal.gyp:wvcdm_shared',
-            ]
-          }
-        ]
-      ],
     },
   ],
 }