Auto merge of #235 - pcwalton:gonk-gpu-profiler-redux, r=glennw

bors-servo · bors-servo · commit 9309d52279a7 · 2016-03-11T07:08:17.000+05:30
Try harder to fix the GPU profiler on Gonk. r? @glennw
diff --git a/src/device.rs b/src/device.rs
@@ -765,6 +765,7 @@ impl GpuProfile {
     pub fn end(&mut self) -> u64 { 0 }
 }
 
+#[cfg(not(any(target_os = "android", target_os = "gonk")))]
 impl Drop for GpuProfile {
     fn drop(&mut self) {
         gl::delete_queries(&self.gl_queries);

Original file line number	Diff line number	Diff line change
`@@ -765,6 +765,7 @@ impl GpuProfile {`
`765`	`765`	`pub fn end(&mut self) -> u64 { 0 }`
`766`	`766`	`}`
`767`	`767`
	`768`	`+#[cfg(not(any(target_os = "android", target_os = "gonk")))]`
`768`	`769`	`impl Drop for GpuProfile {`
`769`	`770`	`fn drop(&mut self) {`
`770`	`771`	`gl::delete_queries(&self.gl_queries);`