DO NOT MERGE

Merge pie-platform-release (PPRL.181205.001, history only) into master

Bug: 120502534
Change-Id: Id2708adf8c4e6c15060eeb5462e0d8bed998e54d
diff --git a/Android.bp b/Android.bp
index 13bbf9f..9299471 100644
--- a/Android.bp
+++ b/Android.bp
@@ -101,6 +101,7 @@
 
 cc_library{
     name: "libdng_sdk",
+    host_supported: true,
     vendor_available: true,
     defaults: ["libdng_sdk-defaults"],
 
@@ -111,6 +112,17 @@
         "libjpeg",
     ],
 
+    target: {
+        linux_glibc: {
+            static_libs: ["libcompiler_rt-extras"],
+        },
+        darwin: {
+            host_ldlibs: [
+                "-framework AppKit",
+            ],
+        },
+    },
+
     export_include_dirs: ["source"],
 }
 
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
-	
 	}
 
 /*****************************************************************************/