commit 6878a13442ae8d3c4cf9126abe05285294db55d5
author Jerome Gaillard <jgaillard@google.com> Tue Nov 20 04:34:11 2018 -0800
committer android-build-merger <android-build-merger@google.com> Tue Nov 20 04:34:11 2018 -0800
tree d058480af51876de6659fbbad18d801a6f405489
parent 8fc7e4f83fab1e76676706d3361894f2ac330cc9
parent a2b40c70c7e51f216696a9d9ab0a4bf36d8711fb

Enable libdng_sdk for macOs am: d875b81f79
am: a2b40c70c7

Change-Id: Ibe61f65f8585fdf8420e7d721da0042d40eafeeb

Android.bp

diff --git a/Android.bp b/Android.bp
index ac01a1c..9299471 100644
--- a/Android.bp
+++ b/Android.bp
@@ -113,12 +113,13 @@
     ],
 
     target: {
-        host: {
+        linux_glibc: {
             static_libs: ["libcompiler_rt-extras"],
         },
         darwin: {
-            // TODO(b/67474260) Turn this back on
-            enabled: false,
+            host_ldlibs: [
+                "-framework AppKit",
+            ],
         },
     },
 

source/dng_utils.cpp

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 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
-	
 	}
 
 /*****************************************************************************/