Small fixes for auto generating Android.mk

Small fixes for auto generating Android.mk

Turn off -Wno-c++11-extensions for Android. The Android framework does
not support this flag. Using it gives a bunch of warnings when building,
so remove it.

Remove skia_chrome_utils from framework. They are experimental and not
used by Android.

BUG=skia:1975
Committed: http://code.google.com/p/skia/source/detail?r=13475

[scroggo, 2014-02-13 21:26:14]

https://codereview.chromium.org/164793002/diff/50001/Android.mk
File Android.mk (left):

https://codereview.chromium.org/164793002/diff/50001/Android.mk#oldcode61
Android.mk:61: -Wno-c++11-extensions \
This isn't checked in, but I tracked a branch that has it so I could show the
difference these changes make.

[djsollen, 2014-02-13 21:32:09]

lgtm.  As a side note, I think we should look at rolling these 2 CLs into our
generator.

https://android-review.googlesource.com/#/c/78875/15
https://android-review.googlesource.com/#/c/81154/2

[scroggo, 2014-02-13 21:35:13]

On 2014/02/13 21:32:09, djsollen wrote:
> lgtm.  As a side note, I think we should look at rolling these 2 CLs into our
> generator.
> 
> https://android-review.googlesource.com/#/c/78875/15
> https://android-review.googlesource.com/#/c/81154/2

Agreed! adding to the bug.

[scroggo, 2014-02-17 14:08:50]

The CQ bit was checked by scroggo@google.com

[commit-bot: I haz the power, 2014-02-17 14:09:01]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/scroggo@google.com/164793002/50001

[commit-bot: I haz the power, 2014-02-17 14:09:03]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-17 14:09:03]

Failed to apply patch for Android.mk:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  can't find file to patch at input line 6
  Perhaps you used the wrong -p or --strip option?
  The text leading up to this was:
  --------------------------
  |Index: Android.mk
  |diff --git a/Android.mk b/Android.mk
  |index
54b630ea6e590d864e89fc111eaa9846ac92be12..005f04e68e7641f0ab9fe009b75a654d47a4420f
100644
  |--- a/Android.mk
  |+++ b/Android.mk
  --------------------------
  No file to patch.  Skipping patch.
  3 out of 3 hunks ignored

Patch:       Android.mk
Index: Android.mk
diff --git a/Android.mk b/Android.mk
index
54b630ea6e590d864e89fc111eaa9846ac92be12..005f04e68e7641f0ab9fe009b75a654d47a4420f
100644
--- a/Android.mk
+++ b/Android.mk
@@ -58,7 +58,6 @@ LOCAL_CFLAGS += \
 	-Winit-self \
 	-Wpointer-arith \
 	-Wno-unused-parameter \
-	-Wno-c++11-extensions \
 	-U_FORTIFY_SOURCE \
 	-D_FORTIFY_SOURCE=1 \
 	-fuse-ld=gold \
@@ -78,7 +77,6 @@ LOCAL_CFLAGS += \
 	-DSK_BUILD_FOR_ANDROID \
 	-DSK_FONTHOST_DOES_NOT_USE_FONTMGR \
 	-DSK_USE_POSIX_THREADS \
-	-DGR_CHROME_UTILS=1 \
 	-DSK_SUPPORT_PDF
 
 LOCAL_CPPFLAGS := \
@@ -514,7 +512,6 @@ LOCAL_SRC_FILES := \
 	src/gpu/gl/debug/SkDebugGLContext.cpp \
 	src/gpu/gl/GrGLCreateNullInterface.cpp \
 	src/gpu/gl/SkNullGLContext.cpp \
-	../experimental/ChromeUtils/SkBorder.cpp \
 	src/core/SkFlate.cpp
 
 LOCAL_SHARED_LIBRARIES := \

[scroggo, 2014-02-17 14:23:34]

On 2014/02/17 14:09:03, I haz the power (commit-bot) wrote:
> Failed to apply patch for Android.mk:
> While running patch -p1 --forward --force --no-backup-if-mismatch;
>   can't find file to patch at input line 6
>   Perhaps you used the wrong -p or --strip option?
>   The text leading up to this was:
>   --------------------------
>   |Index: Android.mk
>   |diff --git a/Android.mk b/Android.mk
>   |index
>
54b630ea6e590d864e89fc111eaa9846ac92be12..005f04e68e7641f0ab9fe009b75a654d47a4420f
> 100644
>   |--- a/Android.mk
>   |+++ b/Android.mk
>   --------------------------
>   No file to patch.  Skipping patch.
>   3 out of 3 hunks ignored
> 
> Patch:       Android.mk
> Index: Android.mk
> diff --git a/Android.mk b/Android.mk
> index
>
54b630ea6e590d864e89fc111eaa9846ac92be12..005f04e68e7641f0ab9fe009b75a654d47a4420f
> 100644
> --- a/Android.mk
> +++ b/Android.mk
> @@ -58,7 +58,6 @@ LOCAL_CFLAGS += \
>  	-Winit-self \
>  	-Wpointer-arith \
>  	-Wno-unused-parameter \
> -	-Wno-c++11-extensions \
>  	-U_FORTIFY_SOURCE \
>  	-D_FORTIFY_SOURCE=1 \
>  	-fuse-ld=gold \
> @@ -78,7 +77,6 @@ LOCAL_CFLAGS += \
>  	-DSK_BUILD_FOR_ANDROID \
>  	-DSK_FONTHOST_DOES_NOT_USE_FONTMGR \
>  	-DSK_USE_POSIX_THREADS \
> -	-DGR_CHROME_UTILS=1 \
>  	-DSK_SUPPORT_PDF
>  
>  LOCAL_CPPFLAGS := \
> @@ -514,7 +512,6 @@ LOCAL_SRC_FILES := \
>  	src/gpu/gl/debug/SkDebugGLContext.cpp \
>  	src/gpu/gl/GrGLCreateNullInterface.cpp \
>  	src/gpu/gl/SkNullGLContext.cpp \
> -	../experimental/ChromeUtils/SkBorder.cpp \
>  	src/core/SkFlate.cpp
>  
>  LOCAL_SHARED_LIBRARIES := \

Patch set 3 removes Android.mk, which was only there for demonstration (and is
not part of the Skia repo).

[scroggo, 2014-02-17 14:23:37]

The CQ bit was checked by scroggo@google.com

[commit-bot: I haz the power, 2014-02-17 14:23:41]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/scroggo@google.com/164793002/150001

[commit-bot: I haz the power, 2014-02-17 15:22:30]

Change committed as 13475