diff options
| author | Martin Storsjo <martin@martin.st> | 2014-11-27 22:51:14 +0200 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2014-12-18 16:31:57 +0200 |
| commit | c0fcdc07cc3fd44a1fd27fc9b84a5be3651cea22 (patch) | |
| tree | 97c2aef42582a548f61ddd1487fb850495d5f4a2 /include | |
| parent | 09a1f34f2f45fe01b7dc6a15b15259ba61e47b5b (diff) | |
| download | frameworks_av-c0fcdc07cc3fd44a1fd27fc9b84a5be3651cea22.zip frameworks_av-c0fcdc07cc3fd44a1fd27fc9b84a5be3651cea22.tar.gz frameworks_av-c0fcdc07cc3fd44a1fd27fc9b84a5be3651cea22.tar.bz2 | |
Use define for drm property keys instead of defining as char pointers
When defined as char pointers, every compilation unit that includes
the NdkMediaDrm.h header defines a new copy of the same global
variables - leading to linker errors due to multiple definitions
if more than one file includes it.
By using a define, they don't generate any symbols. The NdkMediaFormat.h
header uses extern const char* for a similar set of keys, but that
can't be added after the actual platform has shipped. The other
alternative would be to declare them as static const char*, which
wouldn't generate global symbols, but which could trigger warnings
about unused static symbols instead.
Change-Id: I14ca81d94309b7f437b3bc144920c48a8b3f0261
Diffstat (limited to 'include')
| -rw-r--r-- | include/ndk/NdkMediaDrm.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/ndk/NdkMediaDrm.h b/include/ndk/NdkMediaDrm.h index 10afdd9..3c312a9 100644 --- a/include/ndk/NdkMediaDrm.h +++ b/include/ndk/NdkMediaDrm.h @@ -327,24 +327,24 @@ media_status_t AMediaDrm_releaseSecureStops(AMediaDrm *, /** * String property name: identifies the maker of the DRM engine plugin */ -const char *PROPERTY_VENDOR = "vendor"; +#define PROPERTY_VENDOR "vendor" /** * String property name: identifies the version of the DRM engine plugin */ -const char *PROPERTY_VERSION = "version"; +#define PROPERTY_VERSION "version" /** * String property name: describes the DRM engine plugin */ -const char *PROPERTY_DESCRIPTION = "description"; +#define PROPERTY_DESCRIPTION "description" /** * String property name: a comma-separated list of cipher and mac algorithms * supported by CryptoSession. The list may be empty if the DRM engine * plugin does not support CryptoSession operations. */ -const char *PROPERTY_ALGORITHMS = "algorithms"; +#define PROPERTY_ALGORITHMS "algorithms" /** * Read a DRM engine plugin String property value, given the property name string. @@ -361,7 +361,7 @@ media_status_t AMediaDrm_getPropertyString(AMediaDrm *, const char *propertyName * Byte array property name: the device unique identifier is established during * device provisioning and provides a means of uniquely identifying each device. */ -const char *PROPERTY_DEVICE_UNIQUE_ID = "deviceUniqueId"; +#define PROPERTY_DEVICE_UNIQUE_ID "deviceUniqueId" /** * Read a DRM engine plugin byte array property value, given the property name string. |