diff options
| author | Jerome Gaillard <jgaillard@google.com> | 2018-11-20 04:43:15 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-11-20 04:43:15 -0800 |
| commit | 9edba57843d06bf96d0f27fa9e27551b9cd260ff (patch) | |
| tree | d058480af51876de6659fbbad18d801a6f405489 | |
| parent | 5c8b2e9eeacee2f18d2c41aebe82ab49ad253c49 (diff) | |
| parent | 6878a13442ae8d3c4cf9126abe05285294db55d5 (diff) | |
| download | dng_sdk-9edba57843d06bf96d0f27fa9e27551b9cd260ff.tar.gz | |
Enable libdng_sdk for macOs am: d875b81f79 am: a2b40c70c7
am: 6878a13442
Change-Id: I54b6cb29aca379c7769fd62f1f93268dc65cb36f
| -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 - } /*****************************************************************************/ |