diff options
author | Jerome Gaillard <jgaillard@google.com> | 2018-11-06 13:44:08 +0000 |
---|---|---|
committer | Jerome Gaillard <jgaillard@google.com> | 2018-11-06 13:44:08 +0000 |
commit | d875b81f79af20fe8dc89d233e0da76cf00cc79c (patch) | |
tree | d058480af51876de6659fbbad18d801a6f405489 | |
parent | eef3c2700edf4dcd0055235c451c020d457f45fa (diff) | |
download | dng_sdk-d875b81f79af20fe8dc89d233e0da76cf00cc79c.tar.gz |
Enable libdng_sdk for macOsandroid-wear-8.0.0_r2android-n-iot-release-ihome-igv1nougat-iot-release
Following the fix for libjpeg (commit d2a27d5), this enables the host
build of libdng_sdk for macOs. This requires a change in dng_utils.cpp
to remove usage of a deprecated API on macOs.
Test: macOs sdk build
Change-Id: Ife2123949d57291435badb0410ef0c3269bd2db8
-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 - } /*****************************************************************************/ |