diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-07 22:34:05 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-07 22:34:05 +0000 |
| commit | 521cd94a0366d793fc2e1752ed96d5f36d8ba6ac (patch) | |
| tree | d8629c6237a82e8428cbe5faa3cd32e8eda2ff09 /content | |
| parent | df2a3057eb2c4a13deabefcad8c5a0c13f78aa67 (diff) | |
| download | chromium_src-521cd94a0366d793fc2e1752ed96d5f36d8ba6ac.zip chromium_src-521cd94a0366d793fc2e1752ed96d5f36d8ba6ac.tar.gz chromium_src-521cd94a0366d793fc2e1752ed96d5f36d8ba6ac.tar.bz2 | |
[Android] Change jni_gen_dir to jni_gen_package for jni_generator.
With the old name it was getting relativized which is undesirable. See
bug for more details.
BUG=159133
TBR=ben (nobody really cares about this outside of build/ which cjhopman approved)
Review URL: https://chromiumcodereview.appspot.com/12558005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186803 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/content.gyp | 6 | ||||
| -rw-r--r-- | content/content_jni.gypi | 2 | ||||
| -rw-r--r-- | content/content_shell.gypi | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/content/content.gyp b/content/content.gyp index f5679b9..d01e7d7 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -359,7 +359,7 @@ 'target_name': 'surface_texture_jni_headers', 'type': 'none', 'variables': { - 'jni_gen_dir': 'content', + 'jni_gen_package': 'content', 'input_java_class': 'android/graphics/SurfaceTexture.class', 'input_jar_file': '<(android_sdk)/android.jar', }, @@ -369,7 +369,7 @@ 'target_name': 'surface_jni_headers', 'type': 'none', 'variables': { - 'jni_gen_dir': 'content', + 'jni_gen_package': 'content', 'input_java_class': 'android/view/Surface.class', 'input_jar_file': '<(android_sdk)/android.jar', }, @@ -379,7 +379,7 @@ 'target_name': 'java_set_jni_headers', 'type': 'none', 'variables': { - 'jni_gen_dir': 'content', + 'jni_gen_package': 'content', 'input_java_class': 'java/util/HashSet.class', 'input_jar_file': '<(android_sdk)/android.jar', }, diff --git a/content/content_jni.gypi b/content/content_jni.gypi index 44ef10a..cbe132a 100644 --- a/content/content_jni.gypi +++ b/content/content_jni.gypi @@ -34,7 +34,7 @@ 'public/android/java/src/org/chromium/content/common/TraceEvent.java', ], 'variables': { - 'jni_gen_dir': 'content' + 'jni_gen_package': 'content' }, 'includes': [ '../build/jni_generator.gypi' ], } diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 91a0ee3..9042c5c 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -587,7 +587,7 @@ ], }, 'variables': { - 'jni_gen_dir': 'content/shell', + 'jni_gen_package': 'content/shell', }, 'includes': [ '../build/jni_generator.gypi' ], }, |