mozilla-central: changeset 169433:602341e2f084b7d5c6cc7548ef0ba7c01970676d

author	George Wright <george@mozilla.com>
	Thu, 13 Feb 2014 12:19:07 -0500
changeset 169433	602341e2f084b7d5c6cc7548ef0ba7c01970676d
parent 169432	609d3ba60b5bdec91a56fbf8a5997b8c5c525584
child 169434	14e857f528b21289b151d8bc4d97b98bd53d0bfe
push id	26250
push user	kwierso@gmail.com
push date	Wed, 19 Feb 2014 05:30:36 +0000
treeherder	mozilla-central@bf0e76f2a7d4 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	snorp
bugs	910754
milestone	30.0a1
first release with	nightly linux32 bf0e76f2a7d4 / 30.0a1 / 20140219030203 / files nightly linux64 bf0e76f2a7d4 / 30.0a1 / 20140219030203 / files nightly mac bf0e76f2a7d4 / 30.0a1 / 20140219030203 / files nightly win32 bf0e76f2a7d4 / 30.0a1 / 20140219030203 / files nightly win64 bf0e76f2a7d4 / 30.0a1 / 20140219030203 / files
last release without	nightly linux32 6e3ec93efe1d / 30.0a1 / 20140218030202 / files nightly linux64 6e3ec93efe1d / 30.0a1 / 20140218030202 / files nightly mac 6e3ec93efe1d / 30.0a1 / 20140218030202 / files nightly win32 6e3ec93efe1d / 30.0a1 / 20140218030202 / files nightly win64 6e3ec93efe1d / 30.0a1 / 20140218030202 / files

--- a/other-licenses/skia-npapi/moz.build
+++ b/other-licenses/skia-npapi/moz.build
@@ -19,12 +19,12 @@ UNIFIED_SOURCES += [
 FINAL_LIBRARY = 'xul'
 
 DEFINES['SK_BUILD_FOR_ANDROID_NDK'] = True
 
 LOCAL_INCLUDES += [
     '/dom/plugins/base',
     '/dom/plugins/base/android',
     '/gfx/gl',
-    '/gfx/skia/include/config',
-    '/gfx/skia/include/core',
+    '/gfx/skia/trunk/include/config',
+    '/gfx/skia/trunk/include/core',
 ]