diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-12 19:44:35 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-12 19:44:35 +0000 |
| commit | 2d6535a91dd94f93d74964bd21731794d9369f5e (patch) | |
| tree | 0c58b4eaf39e876b81ccc53699d803965b35b972 /gyp | |
| parent | 42316095ecb795a2cc086490c7eae61ca8949c01 (diff) | |
Remove support for building skia android apps outside of an APK.
Review URL: https://codereview.appspot.com/6663043
git-svn-id: http://skia.googlecode.com/svn/trunk@5936 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/apptype_console.gypi | 2 | ||||
| -rw-r--r-- | gyp/common_variables.gypi | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/gyp/apptype_console.gypi b/gyp/apptype_console.gypi index 9b42db51aa..80e925d9de 100644 --- a/gyp/apptype_console.gypi +++ b/gyp/apptype_console.gypi @@ -12,7 +12,7 @@ }, }, 'conditions': [ - [ 'skia_os == "android" and android_make_apk == 1', { + [ 'skia_os == "android"', { 'dependencies': [ 'android_deps.gyp:Android_EntryPoint', ], diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index 1976dbee27..3d19e62094 100644 --- a/gyp/common_variables.gypi +++ b/gyp/common_variables.gypi @@ -83,7 +83,6 @@ 'skia_nv_path_rendering%': 0, 'skia_angle%': 0, 'skia_directwrite%': 0, - 'android_make_apk%': 1, 'skia_nacl%': 0, 'skia_gpu%': 1, 'skia_osx_sdkroot%': 'macosx', @@ -102,7 +101,6 @@ 'skia_arch_width%': '<(skia_arch_width)', 'skia_arch_type%': '<(skia_arch_type)', 'skia_directwrite%': '<(skia_directwrite)', - 'android_make_apk%': '<(android_make_apk)', 'skia_nacl%': '<(skia_nacl)', 'skia_gpu%': '<(skia_gpu)', 'skia_osx_sdkroot%': '<(skia_osx_sdkroot)', |