summaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorcjhopman <cjhopman@chromium.org>2014-10-16 11:02:23 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-16 18:03:16 +0000
commit4fe114e79020c97813df6d36dfb156b834749126 (patch)
tree549f30b741a0cc05edb62d952a081f5efedc49f9 /components
parent042b047e4671d1af0cc71db959731f95728b344f (diff)
downloadchromium_src-4fe114e79020c97813df6d36dfb156b834749126.zip
chromium_src-4fe114e79020c97813df6d36dfb156b834749126.tar.gz
chromium_src-4fe114e79020c97813df6d36dfb156b834749126.tar.bz2
Add ChromeShellTestApk and other chrome/ test stuff
Adds these targets: //chrome/android:chrome_javatests //chrome/android:chrome_shell_test_java //chrome/android:chrome_shell_test_apk //chrome/android:chrome_sync_shell_test_apk //chrome/android:uiautomator_tests_java //chrome/android:uiautomator_tests //chrome/test/android:chrome_java_test_support //chrome/test/chromedriver/test/webview_shell:chromedriver_webview_shell_apk //chrome/test/chromedriver/test/webview_shell:chromedriver_webview_shell_resources depends on https://codereview.chromium.org/570203002/ TBR=ben BUG=359249 Review URL: https://codereview.chromium.org/586383002 Cr-Commit-Position: refs/heads/master@{#299926}
Diffstat (limited to 'components')
-rw-r--r--components/bookmarks.gypi6
1 files changed, 3 insertions, 3 deletions
diff --git a/components/bookmarks.gypi b/components/bookmarks.gypi
index ffdfd1b..6f6b770b 100644
--- a/components/bookmarks.gypi
+++ b/components/bookmarks.gypi
@@ -125,7 +125,7 @@
['OS=="android"', {
'targets': [
{
- # GN: //components/common/android:bookmarks_java
+ # GN: //components/bookmarks/common/android:bookmarks_java
'target_name': 'bookmarks_java',
'type': 'none',
'dependencies': [
@@ -138,7 +138,7 @@
'includes': [ '../build/java.gypi' ],
},
{
- # GN: //components/common/android:bookmarks_jni_headers
+ # GN: //components/bookmarks/common/android:bookmarks_jni_headers
'target_name': 'bookmarks_jni_headers',
'type': 'none',
'sources': [
@@ -150,7 +150,7 @@
'includes': [ '../build/jni_generator.gypi' ],
},
{
- # GN: //components/common/android:bookmarks_type_javagen
+ # GN: //components/bookmarks/common/android:bookmarks_type_javagen
'target_name': 'bookmark_type_java',
'type': 'none',
'sources': [