diff options
| author | Jerome Gaillard <jgaillard@google.com> | 2018-11-20 04:25:05 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-11-20 04:25:05 -0800 |
| commit | a2b40c70c7e51f216696a9d9ab0a4bf36d8711fb (patch) | |
| tree | d058480af51876de6659fbbad18d801a6f405489 | |
| parent | a58d85b32ddcbd2ff624dfaa99bb1e5bb47c207f (diff) | |
| parent | d875b81f79af20fe8dc89d233e0da76cf00cc79c (diff) | |
| download | dng_sdk-a2b40c70c7e51f216696a9d9ab0a4bf36d8711fb.tar.gz | |
Enable libdng_sdk for macOs
am: d875b81f79
Change-Id: I0bfd8f6eb8bc6ff65fc032ca01a0eea2520e5608
| -rw-r--r-- | Android.bp | 7 | ||||
| -rw-r--r-- | source/dng_utils.cpp | 18 |
2 files changed, 4 insertions, 21 deletions
@@ -113,12 +113,13 @@ cc_library{ ], target: { - host: { + linux_glibc: { static_libs: ["libcompiler_rt-extras"], }, darwin: { - // TODO(b/67474260) Turn this back on - enabled: false, + host_ldlibs: [ + "-framework AppKit", + ], }, }, diff --git a/source/dng_utils.cpp b/source/dng_utils.cpp index bf129c1..a22afbf 100644 --- a/source/dng_utils.cpp +++ b/source/dng_utils.cpp @@ -302,26 +302,8 @@ real64 TickTimeInSeconds () real64 TickCountInSeconds () { - #if qWinOS - - return GetTickCount () * (1.0 / 1000.0); - - #elif qMacOS - - #if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR - // TODO: Needs implementation. - ThrowProgramError ("TickCountInSeconds() not implemented on iOS"); - return 0; - #else - return TickCount () * (1.0 / 60.0); - #endif // TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR - - #else - return TickTimeInSeconds (); - #endif - } /*****************************************************************************/ |