Remove som GYP annotations, remove unused manifest.

Removes annotations of "GYP version" from GN targets. Removes shell.exe.manifest which was used only by the GYP build. TBR=dpranke@chromium.org CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel Review-Url: https://codereview.chromium.org/2373683003 Cr-Commit-Position: refs/heads/master@{#421335}
Denger-Network · Sep 27, 2016 · cde1af7 · cde1af7
1 parent d80ba1e
commit cde1af7
Show file tree

Hide file tree

Showing 57 changed files with 2 additions and 192 deletions.
diff --git a/android_webview/test/BUILD.gn b/android_webview/test/BUILD.gn
@@ -15,7 +15,6 @@ group("test") {
   ]
 }
 
-# GYP: //android_webview/android_webview_tests.gypi:android_webview_apk
 android_apk("android_webview_apk") {
   deps = [
     ":android_webview_apk_assets",
@@ -85,7 +84,6 @@ android_assets("android_webview_apk_assets") {
   ]
 }
 
-# GYP: //android_webview/android_webview_tests.gypi:libstandalonelibwebviewchromium
 shared_library("libstandalonelibwebviewchromium") {
   sources = [
     "../lib/main/webview_entry_point.cc",
@@ -97,7 +95,6 @@ shared_library("libstandalonelibwebviewchromium") {
   configs -= [ "//build/config/android:hide_native_jni_exports" ]
 }
 
-# GYP: //android_webview/android_webview_tests.gypi:android_webview_test_apk
 instrumentation_test_apk("android_webview_test_apk") {
   apk_name = "AndroidWebViewTest"
   apk_under_test = ":android_webview_apk"
@@ -210,7 +207,6 @@ instrumentation_test_apk("android_webview_test_apk") {
   additional_apks = [ "//net/android:net_test_support_apk" ]
 }
 
-# GYP: //android_webview/android_webview_tests.gypi:android_webview_unittests
 test("android_webview_unittests") {
   # Tests do not require any data, but our dependencies pull a lot in.
   ignore_all_data_deps = true
@@ -257,7 +253,6 @@ android_assets("android_webview_unittests_assets") {
   ]
 }
 
-# GYP: //android_webview/android_webview_tests.gypi:android_webview_unittests_java
 android_library("android_webview_unittests_java") {
   testonly = true
   deps = [
@@ -272,7 +267,6 @@ android_library("android_webview_unittests_java") {
   ]
 }
 
-# GYP: //android_webview/android_webview_tests.gypi:android_webview_unittests_jni
 generate_jni("android_webview_unittests_jni") {
   jni_package = "android_webview_unittests"
   sources = [
@@ -281,7 +275,6 @@ generate_jni("android_webview_unittests_jni") {
   ]
 }
 
-# GYP: //android_webview/android_webview_tests.gypi:libdrawgl
 shared_library("libdrawgl") {
   sources = [
     "shell/src/draw_gl/draw_gl.cc",

diff --git a/android_webview/tools/system_webview_shell/BUILD.gn b/android_webview/tools/system_webview_shell/BUILD.gn
@@ -16,7 +16,6 @@ group("system_webview_shell") {
   ]
 }
 
-# GYP: //android_webview/android_webview_shell.gypi:system_webview_shell_apk
 android_apk("system_webview_shell_apk") {
   apk_name = "SystemWebViewShell"
   java_files = [
@@ -42,7 +41,6 @@ android_resources("system_webview_shell_apk_resources") {
   custom_package = "org.chromium.webview_shell"
 }
 
-# GYP: //android_webview/android_webview_shell.gypi:system_webview_shell_page_cycler_apk
 instrumentation_test_apk("system_webview_shell_page_cycler_apk") {
   apk_name = "SystemWebViewShellPageCycler"
   apk_under_test = ":system_webview_shell_apk"
@@ -60,7 +58,6 @@ instrumentation_test_apk("system_webview_shell_page_cycler_apk") {
   ]
 }
 
-# GYP: //android_webview/android_webview_shell.gypi:system_webview_shell_layout_test_apk
 instrumentation_test_apk("system_webview_shell_layout_test_apk") {
   apk_name = "SystemWebViewShellLayoutTest"
   apk_under_test = ":system_webview_shell_apk"

diff --git a/base/BUILD.gn b/base/BUILD.gn
@@ -2208,7 +2208,6 @@ if (enable_nocompile_tests) {
 }
 
 if (is_android) {
-  # GYP: //base.gyp:base_jni_headers
   generate_jni("base_jni_headers") {
     sources = [
       "android/java/src/org/chromium/base/AnimationFrameTimeHistogram.java",
@@ -2247,13 +2246,11 @@ if (is_android) {
     jni_package = "base"
   }
 
-  # GYP: //base.gyp:android_runtime_jni_headers
   generate_jar_jni("android_runtime_jni_headers") {
     jni_package = "base"
     classes = [ "java/lang/Runtime.class" ]
   }
 
-  # GYP: //base.gyp:base_java
   android_library("base_java") {
     srcjar_deps = [
       ":base_android_java_enums_srcjar",
@@ -2341,7 +2338,6 @@ if (is_android) {
     ]
   }
 
-  # GYP: //base.gyp:base_javatests
   android_library("base_javatests") {
     testonly = true
     deps = [
@@ -2358,7 +2354,6 @@ if (is_android) {
     ]
   }
 
-  # GYP: //base.gyp:base_java_test_support
   android_library("base_java_test_support") {
     testonly = true
     deps = [
@@ -2403,7 +2398,6 @@ if (is_android) {
     ]
   }
 
-  # GYP: //base.gyp:base_junit_tests
   junit_binary("base_junit_tests") {
     java_files = [
       "android/junit/src/org/chromium/base/BaseChromiumApplicationTest.java",
@@ -2421,10 +2415,6 @@ if (is_android) {
     srcjar_deps = [ ":base_build_config_gen" ]
   }
 
-  # GYP: //base.gyp:base_java_application_state
-  # GYP: //base.gyp:base_java_library_load_from_apk_status_codes
-  # GYP: //base.gyp:base_java_library_process_type
-  # GYP: //base.gyp:base_java_memory_pressure_level
   java_cpp_enum("base_android_java_enums_srcjar") {
     sources = [
       "android/application_status_listener.h",
@@ -2434,7 +2424,6 @@ if (is_android) {
     ]
   }
 
-  # GYP: //base/base.gyp:base_build_config_gen
   java_cpp_template("base_build_config_gen") {
     sources = [
       "android/java/templates/BuildConfig.template",
@@ -2447,15 +2436,13 @@ if (is_android) {
     }
   }
 
-  # GYP: //base/base.gyp:base_native_libraries_gen
   java_cpp_template("base_native_libraries_gen") {
     sources = [
       "android/java/templates/NativeLibraries.template",
     ]
     package_name = "org/chromium/base/library_loader"
   }
 
-  # GYP: //base.gyp:base_java_unittest_support
   android_library("base_java_unittest_support") {
     testonly = true
     deps = [

diff --git a/base/android/jni_generator/BUILD.gn b/base/android/jni_generator/BUILD.gn
@@ -5,7 +5,6 @@
 import("//build/config/android/rules.gni")
 import("//testing/test.gni")
 
-# GYP: //base/android/jni_generator/jni_generator.gyp:jni_generator_py_tests
 action("jni_generator_py_tests") {
   _stamp = "$target_gen_dir/jni_generator_py_tests.stamp"
   inputs = [
@@ -24,15 +23,13 @@ action("jni_generator_py_tests") {
   ]
 }
 
-# GYP: //base/android/jni_generator/jni_generator.gyp:jni_sample_header
 generate_jni("jni_sample_header") {
   sources = [
     "java/src/org/chromium/example/jni_generator/SampleForTests.java",
   ]
   jni_package = "example"
 }
 
-# GYP: //base/android/jni_generator/jni_generator.gyp:jni_sample_java
 android_library("jni_sample_java") {
   java_files =
       [ "java/src/org/chromium/example/jni_generator/SampleForTests.java" ]
@@ -43,7 +40,6 @@ android_library("jni_sample_java") {
 
 # This executable doesn't actually run, but at least serves to test that
 # generated bindings compile properly.
-# GYP: //base/android/jni_generator/jni_generator.gyp:jni_generator_tests
 executable("jni_generator_tests") {
   deps = [
     ":jni_generator_py_tests",

diff --git a/base/android/linker/BUILD.gn b/base/android/linker/BUILD.gn
@@ -6,7 +6,6 @@ import("//build/config/android/config.gni")
 
 assert(is_android)
 
-# GYP: //base/base.gyp:chromium_android_linker
 shared_library("chromium_android_linker") {
   sources = [
     "android_dlext.h",

diff --git a/base/test/BUILD.gn b/base/test/BUILD.gn
@@ -22,7 +22,6 @@ static_library("test_config") {
   ]
 }
 
-# GYP: //base/base.gyp:test_support_base
 static_library("test_support") {
   testonly = true
   sources = [

diff --git a/build/android/pylib/device/commands/BUILD.gn b/build/android/pylib/device/commands/BUILD.gn
@@ -10,7 +10,6 @@ group("commands") {
   ]
 }
 
-# GYP: //build/android/pylib/device/commands/commands.gyp:chromium_commands
 android_library("chromium_commands") {
   java_files = [ "java/src/org/chromium/android/commands/unzip/Unzip.java" ]
   dex_path = "$root_build_dir/lib.java/chromium_commands.dex.jar"

diff --git a/build/android/pylib/remote/device/dummy/BUILD.gn b/build/android/pylib/remote/device/dummy/BUILD.gn
@@ -5,7 +5,6 @@
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 
-# GYP: //build/android/pylib/remote/device/dummy/dummy.gyp:remote_device_dummy_apk
 android_apk("remote_device_dummy_apk") {
   android_manifest = "//build/android/AndroidManifest.xml"
   java_files = [ "src/org/chromium/dummy/Dummy.java" ]

diff --git a/build/android/rezip/BUILD.gn b/build/android/rezip/BUILD.gn
@@ -4,7 +4,6 @@
 
 import("//build/config/android/rules.gni")
 
-# GYP: //build/android/rezip.gyp:rezip_apk_jar
 java_library("rezip") {
   jar_path = "$root_build_dir/lib.java/rezip_apk.jar"
   java_files = [ "RezipApk.java" ]

diff --git a/build/buildflag_header.gni b/build/buildflag_header.gni
@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 # Generates a header with preprocessor defines specified by the build file.
-# The GYP version of this (with instructions) is build/buildflag_header.gypi.
 #
 # The flags are converted to function-style defines with mangled names and
 # code uses an accessor macro to access the values. This is to try to

diff --git a/build/secondary/third_party/android_tools/BUILD.gn b/build/secondary/third_party/android_tools/BUILD.gn
@@ -15,8 +15,6 @@ config("cpu_features_warnings") {
   }
 }
 
-# This is the GN version of
-# //build/android/ndk.gyp:cpu_features
 source_set("cpu_features") {
   sources = [
     "$android_ndk_root/sources/android/cpufeatures/cpu-features.c",

diff --git a/chromecast/BUILD.gn b/chromecast/BUILD.gn
@@ -352,7 +352,6 @@ repack("cast_shell_pak") {
   }
 }
 
-# GYP target: chromecast_locales.gyp:chromecast_locales_pak
 action("chromecast_locales_pak") {
   script = "//chromecast/tools/build/chromecast_repack_locales.py"
 
@@ -411,7 +410,6 @@ buildflag_header("chromecast_features") {
 }
 
 if (is_android) {
-  # GYP target: chromecast.gyp:cast_shell_icudata
   android_assets("cast_shell_apk_assets") {
     assert(v8_use_external_startup_data)
 
@@ -427,7 +425,6 @@ if (is_android) {
     disable_compression = true
   }
 
-  # GYP target: chromecast.gyp:cast_shell_apk
   android_apk("cast_shell_apk") {
     apk_name = "CastShell"
     android_manifest = "$root_gen_dir/cast_shell_manifest/AndroidManifest.xml"

diff --git a/chromecast/android/BUILD.gn b/chromecast/android/BUILD.gn
@@ -16,7 +16,6 @@ source_set("platform_jni_loader") {
   ]
 }
 
-# GYP target: chromecast.gyp:libcast_shell_android
 shared_library("libcast_shell_android") {
   sources = [
     "//chromecast/app/android/cast_jni_loader.cc",

diff --git a/chromecast/app/BUILD.gn b/chromecast/app/BUILD.gn
@@ -74,7 +74,6 @@ test("cast_shell_unittests") {
   ]
 }
 
-# GYP target: chromecast.gyp:cast_shell_resources
 grit("resources") {
   source = "//chromecast/app/resources/shell_resources.grd"
 
@@ -86,7 +85,6 @@ grit("resources") {
   ]
 }
 
-# GYP target: chromecast_locales.gyp:chromecast_settings
 grit("chromecast_settings") {
   source = "//chromecast/app/resources/chromecast_settings.grd"
   resource_ids = "//chromecast/app/resources/resource_ids"

diff --git a/chromecast/base/BUILD.gn b/chromecast/base/BUILD.gn
@@ -26,7 +26,6 @@ if (is_android) {
   assert(cast_product_type >= 0 && cast_product_type <= 3)
 }
 
-# GYP target: chromecast.gyp:cast_base
 source_set("base") {
   sources = [
     "android/dumpstate_writer.cc",
@@ -108,7 +107,6 @@ source_set("init_shlib") {
   ]
 }
 
-# GYP target: n/a
 source_set("test_support") {
   sources = [
     "scoped_temp_file.cc",
@@ -121,7 +119,6 @@ source_set("test_support") {
   ]
 }
 
-# GYP target: chromecast_tests.gypi:cast_base_unittests
 test("cast_base_unittests") {
   sources = [
     "bind_to_task_runner_unittest.cc",
@@ -228,7 +225,6 @@ process_version("cast_version") {
 }
 
 if (is_android) {
-  # GYP target: chromecast.gyp:jni_headers
   generate_jni("jni_headers") {
     sources = [
       "java/src/org/chromium/chromecast/base/ChromecastConfigAndroid.java",
@@ -239,7 +235,6 @@ if (is_android) {
     jni_package = "chromecast"
   }
 
-  # GYP target: chromecast.gyp:cast_base_java
   android_library("base_java") {
     java_src_dir = "//chromecast/base/java/src"
     java_files = [

diff --git a/chromecast/base/component/BUILD.gn b/chromecast/base/component/BUILD.gn
@@ -5,7 +5,6 @@
 import("//chromecast/chromecast.gni")
 import("//testing/test.gni")
 
-# GYP target: chromecast.gyp:cast_component
 source_set("component") {
   sources = [
     "component.cc",
@@ -18,7 +17,6 @@ source_set("component") {
   ]
 }
 
-# GYP target: chromecast_tests.gypi:cast_component_unittests
 test("cast_component_unittests") {
   sources = [
     "component_unittest.cc",

diff --git a/chromecast/browser/android/BUILD.gn b/chromecast/browser/android/BUILD.gn
@@ -6,20 +6,17 @@ import("//build/config/android/rules.gni")
 
 assert(is_android)
 
-# GYP target: chromecast.gyp:cast_shell_manifest
 jinja_template("cast_shell_manifest") {
   input = "apk/AndroidManifest.xml.jinja2"
   output = "$root_gen_dir/cast_shell_manifest/AndroidManifest.xml"
 }
 
-# GYP target: n/a
 android_resources("cast_shell_android_resources") {
   android_manifest = "$root_gen_dir/cast_shell_manifest/AndroidManifest.xml"
   android_manifest_dep = ":cast_shell_manifest"
   resource_dirs = [ "//chromecast/browser/android/apk/res" ]
 }
 
-# GYP target: chromecast.gyp:cast_shell_java
 android_library("cast_shell_java") {
   java_src_dir = "//chromecast/browser/android/apk/src"
   java_files = [

diff --git a/chromecast/common/media/BUILD.gn b/chromecast/common/media/BUILD.gn
@@ -5,7 +5,6 @@
 import("//chromecast/chromecast.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 
-# GYP target: chromecast.gyp:cast_shell_media
 source_set("media") {
   sources = [
     "cast_media_client.cc",

diff --git a/chromecast/media/cdm/BUILD.gn b/chromecast/media/cdm/BUILD.gn
@@ -4,7 +4,6 @@
 
 import("//chromecast/chromecast.gni")
 
-# GYP target: chromecast/media.gyp:media_cdm
 source_set("cdm") {
   sources = [
     "cast_cdm.cc",