Do Not Return an Error When AddKey Says it Needs a Key

Swallows the error NEED_KEY if it comes back from AddKey(), as this
is expected behavior. (It means privacy mode is on and the key that
was just added was the privacy certificate, ergo the real decryption
key is still absent.) Note that this carefully does not squelch the
notification that comes from NEED_KEY, which is still necessary in
order for the app to make a second key request.

Also streamlines a test case that I noticed was overcomplicated for
what it did while poaching code from it for new test cases.

Also removes a .gyp file that was erroneously being copied to the
Android tree.  Android does not use GYP.

Bug: 10495563
Change-Id: Ife3ff0270a0d09dac1b0eb0d84bddffd811e1eef

libwvdrmengine/oemcrypto/oemcrypto.gyp

@@ -1,91 +0,0 @@
-# Copyright 2012 Google Inc. All Rights Reserved.
-# Author: rkuroiwa@google.com (Rintaro Kuroiwa)
-
-{
-  'variables': {
-    'chromium_code': 1,
-    'oec_target_type': "",
-  },
-  'targets': [
-    {
-      'target_name': 'oec_lib',
-      'type': 'none',
-      'conditions': [
-        ['target_arch=="arm" and oec_target_type != "CAN_INSTALL_KEYBOX"', {
-          'dependencies': [
-            'oec_mrvl',
-          ],
-        }, {
-          'dependencies': [
-            'oec_mock',
-          ],
-        }],
-      ],
-    },
-    {
-      'target_name': 'oec_mock',
-      'type': 'static_library',
-      'sources': [
-        'mock/src/oemcrypto_mock.cpp',
-        'mock/src/oemcrypto_engine_mock.cpp',
-        'mock/src/oemcrypto_key_mock.cpp',
-        'mock/src/oemcrypto_keybox_mock.cpp',
-        'mock/src/wvcrc.cpp',
-      ],
-      'include_dirs': [
-        'include',
-      ],
-      'dependencies': [
-        '../../../crypto/crypto.gyp:crypto',
-        # TODO(kqyang): make it platform independent.
-        '../chromium/util.gyp:lock',
-        '../chromium/util.gyp:string_conversions',
-      ],
-    },
-    {
-      'target_name': 'oec_mrvl',
-      'type': 'static_library',
-      'sources': [
-        'eureka/src/oemcrypto_mrvl.cpp',
-      ],
-      'include_dirs': [
-        '../include',
-        '../core/include',
-      ],
-      'dependencies': [
-        '../../../base/base.gyp:base',
-        '../../../crypto/crypto.gyp:crypto',
-      ],
-      'cflags': [
-        '-Wsign-conversion',
-      ],
-      'link_settings': {
-        'libraries': [
-          '-lOSAL',
-          '-lPEAgent',
-        ],
-      },
-    },
-    {
-      'target_name': 'oec_unittest',
-      'type': '<(gtest_target_type)',
-      'conditions': [
-        ['target_arch!="arm" or oec_target_type == "CAN_INSTALL_KEYBOX"', {
-          'defines': [ 'CAN_INSTALL_KEYBOX', ],
-        },],
-      ],
-      'sources': [
-        'test/oemcrypto_test.cpp',
-      ],
-      'include_dirs': [
-        'include',
-        'mock/src',
-      ],
-      'dependencies': [
-        'oec_lib',
-        '../../../testing/gtest.gyp:gtest',
-        '../../../testing/gtest.gyp:gtest_main',
-      ],
-    },
-  ],
-}