Have jni_generator.gypi specify include_dirs to dependent targets.

Rather than each dependent target of a target that generates jni headers having
to specify the appropriate include_dir manually, jni_generator.gypi can do it
via direct_dependent_settings.

TBR=darin@chromium.org

Review URL: https://codereview.chromium.org/111493006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241216 0039d316-1c4b-4281-b951-d872f2087c98

20 files changed, 8 insertions, 87 deletions

diff --git a/android_webview/native/webview_native.gyp b/android_webview/native/webview_native.gyp
index 52f4820..3efe2cc 100644
--- a/android_webview/native/webview_native.gyp
+++ b/android_webview/native/webview_native.gyp
@@ -28,7 +28,6 @@
       'include_dirs': [
         '../..',
         '../../skia/config',
-        '<(SHARED_INTERMEDIATE_DIR)/android_webview',
       ],
       'sources': [
         'android_protocol_handler.cc',
diff --git a/base/android/jni_generator/jni_generator.gyp b/base/android/jni_generator/jni_generator.gyp
index 4bad0dc..2ea36b0 100644
--- a/base/android/jni_generator/jni_generator.gyp
+++ b/base/android/jni_generator/jni_generator.gyp
@@ -56,9 +56,6 @@
         'jni_sample_header',
         'jni_sample_java',
       ],
-      'include_dirs': [
-        '<(SHARED_INTERMEDIATE_DIR)/example',
-      ],
       'sources': [
         'sample_for_tests.cc',
       ],
diff --git a/base/base.gyp b/base/base.gyp
index 407d49d..1c2e931 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -146,9 +146,6 @@
             'base_jni_headers',
             '../third_party/ashmem/ashmem.gyp:ashmem',
           ],
-          'include_dirs': [
-            '<(SHARED_INTERMEDIATE_DIR)/base',
-          ],
           'link_settings': {
             'libraries': [
               '-llog',
@@ -900,9 +897,6 @@
             'base_unittests_jni_headers',
             'base_java_unittest_support',
           ],
-          'include_dirs': [
-            '<(SHARED_INTERMEDIATE_DIR)/base',
-          ],
         }],
       ],
       'sources': [
diff --git a/build/jni_generator.gypi b/build/jni_generator.gypi
index a6c8364..52df4b1 100644
--- a/build/jni_generator.gypi
+++ b/build/jni_generator.gypi
@@ -67,6 +67,11 @@
       ],
     },
   ],
+  'direct_dependent_settings': {
+    'include_dirs': [
+      '<(SHARED_INTERMEDIATE_DIR)/<(jni_gen_package)',
+    ],
+  },
   # This target exports a hard dependency because it generates header
   # files.
   'hard_dependency': 1,
diff --git a/chrome/chrome_android.gypi b/chrome/chrome_android.gypi
index 7de1386..2b32666 100644
--- a/chrome/chrome_android.gypi
+++ b/chrome/chrome_android.gypi
@@ -32,7 +32,6 @@
         'android/testshell/testshell_tab.h',
       ],
       'include_dirs': [
-        '<(SHARED_INTERMEDIATE_DIR)/chromium_testshell',
         '../skia/config',
       ],
       'conditions': [
@@ -110,8 +109,6 @@
       ],
       'include_dirs': [
         '..',
-        '<(SHARED_INTERMEDIATE_DIR)/android',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome',
         '<(android_ndk_include)',
       ],
       'sources': [
diff --git a/components/autofill.gypi b/components/autofill.gypi
index a4937a8..c380bee 100644
--- a/components/autofill.gypi
+++ b/components/autofill.gypi
@@ -41,7 +41,6 @@
       ],
       'include_dirs': [
         '..',
-        '<(SHARED_INTERMEDIATE_DIR)/autofill'
       ],
       'sources': [
         'autofill/core/browser/android/auxiliary_profile_loader_android.cc',
diff --git a/components/navigation_interception.gypi b/components/navigation_interception.gypi
index 993a916..545039d 100644
--- a/components/navigation_interception.gypi
+++ b/components/navigation_interception.gypi
@@ -20,8 +20,6 @@
           'include_dirs': [
             '..',
             '../skia/config',
-            '<(SHARED_INTERMEDIATE_DIR)/navigation_interception',
-
           ],
           'sources': [
             'navigation_interception/intercept_navigation_resource_throttle.cc',
diff --git a/components/web_contents_delegate_android.gypi b/components/web_contents_delegate_android.gypi
index 80e601f..7402175 100644
--- a/components/web_contents_delegate_android.gypi
+++ b/components/web_contents_delegate_android.gypi
@@ -24,7 +24,6 @@
           'include_dirs': [
             '..',
             '../skia/config',
-            '<(SHARED_INTERMEDIATE_DIR)/web_contents_delegate_android',
           ],
           'sources': [
             'web_contents_delegate_android/color_chooser_android.cc',
diff --git a/content/content.gyp b/content/content.gyp
index 14504ee..97a158f 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -495,11 +495,6 @@
           'dependencies': [
             'java_set_jni_headers'
           ],
-          'direct_dependent_settings': {
-            'include_dirs': [
-              '<(SHARED_INTERMEDIATE_DIR)/content',
-            ],
-          },
           'includes': [ 'content_jni.gypi' ],
         },
         {
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index c4ef442..9af6730 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -716,11 +716,6 @@
             'shell/android/java/src/org/chromium/content_shell/ShellManager.java',
             'shell/android/java/src/org/chromium/content_shell/Shell.java',
           ],
-          'direct_dependent_settings': {
-            'include_dirs': [
-              '<(SHARED_INTERMEDIATE_DIR)/content/shell',
-            ],
-          },
           'variables': {
             'jni_gen_package': 'content/shell',
           },
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 2663b51..72bf048 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -1422,11 +1422,6 @@
           'sources': [
             'shell/android/linker_test_apk/src/org/chromium/content_linker_test_apk/LinkerTests.java',
           ],
-          'direct_dependent_settings': {
-            'include_dirs': [
-              '<(SHARED_INTERMEDIATE_DIR)/content/shell',
-            ],
-          },
           'variables': {
             'jni_gen_package': 'content/shell',
           },
@@ -1454,11 +1449,6 @@
           'sources': [
             'public/test/android/javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java',
           ],
-          'direct_dependent_settings': {
-            'include_dirs': [
-              '<(SHARED_INTERMEDIATE_DIR)/content/public/test',
-            ],
-          },
           'variables': {
             'jni_gen_package': 'content/public/test',
           },
diff --git a/media/media.gyp b/media/media.gyp
index 97e2f5d..fb844de 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -547,9 +547,6 @@
           ],
         }],
         ['OS=="android"', {
-          'include_dirs': [
-            '<(SHARED_INTERMEDIATE_DIR)/media',
-          ],
           'dependencies': [
             'media_android_jni_headers',
             'player_android',
@@ -1544,9 +1541,6 @@
           'defines': [
             'MEDIA_IMPLEMENTATION',
           ],
-          'include_dirs': [
-            '<(SHARED_INTERMEDIATE_DIR)/media',
-          ],
         },
         {
           'target_name': 'media_java',
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index 9151d42..6980311 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -338,11 +338,6 @@
           'dependencies': [
             'mojo_java_set_jni_headers',
           ],
-          'direct_dependent_settings': {
-            'include_dirs': [
-              '<(SHARED_INTERMEDIATE_DIR)/mojo',
-            ],
-          },
           'sources': [
             'services/native_viewport/android/src/org/chromium/mojo/NativeViewportAndroid.java',
             'shell/android/apk/src/org/chromium/mojo_shell_apk/MojoMain.java',
diff --git a/net/net.gyp b/net/net.gyp
index c308a8a7..974c395 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -2937,11 +2937,6 @@
             'jni_gen_package': 'net',
             'jni_generator_ptr_type': 'long',
           },
-          'direct_dependent_settings': {
-            'include_dirs': [
-              '<(SHARED_INTERMEDIATE_DIR)/net',
-            ],
-          },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
@@ -2954,11 +2949,6 @@
             'jni_gen_package': 'net',
             'jni_generator_ptr_type': 'long',
           },
-          'direct_dependent_settings': {
-            'include_dirs': [
-              '<(SHARED_INTERMEDIATE_DIR)/net',
-            ],
-          },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
diff --git a/printing/printing.gyp b/printing/printing.gyp
index 3371745..5892f2f 100644
--- a/printing/printing.gyp
+++ b/printing/printing.gyp
@@ -232,11 +232,8 @@
             'printing_context_android.cc',
             'printing_context_android.h',
           ],
-	  'dependencies': [
-	    'printing_jni_headers',
-	  ],
-          'include_dirs': [
-            '<(SHARED_INTERMEDIATE_DIR)/printing',
+          'dependencies': [
+            'printing_jni_headers',
           ],
         }],
       ],
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index ed93d2b..3b6a9fb 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -1843,9 +1843,6 @@
             'remoting_protocol',
             '../google_apis/google_apis.gyp:google_apis',
           ],
-          'include_dirs': [
-            '<(SHARED_INTERMEDIATE_DIR)/remoting',
-          ],
           'sources': [
             'client/jni/android_keymap.cc',
             'client/jni/android_keymap.h',
diff --git a/testing/android/native_test.gyp b/testing/android/native_test.gyp
index bfea40f..0007a07 100644
--- a/testing/android/native_test.gyp
+++ b/testing/android/native_test.gyp
@@ -40,13 +40,6 @@
             'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../../build/jni_generator.gypi' ],
-          # So generated jni headers can be found by targets that
-          # depend on this.
-          'direct_dependent_settings': {
-            'include_dirs': [
-              '<(SHARED_INTERMEDIATE_DIR)',
-            ],
-          },
         },
         {
           'target_name': 'native_test_util',
diff --git a/testing/android/native_test_launcher.cc b/testing/android/native_test_launcher.cc
index 50b213e..3952581 100644
--- a/testing/android/native_test_launcher.cc
+++ b/testing/android/native_test_launcher.cc
@@ -25,8 +25,8 @@
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
+#include "jni/ChromeNativeTestActivity_jni.h"
 #include "testing/android/native_test_util.h"
-#include "testing/jni/ChromeNativeTestActivity_jni.h"
 
 using testing::native_test_util::ArgsToArgv;
 using testing::native_test_util::ParseArgsFromCommandLineFile;
diff --git a/ui/gfx/gfx.gyp b/ui/gfx/gfx.gyp
index 5fb17d5..ed5368a 100644
--- a/ui/gfx/gfx.gyp
+++ b/ui/gfx/gfx.gyp
@@ -419,11 +419,6 @@
          'dependencies': [
            'gfx_view_jni_headers'
          ],
-         'direct_dependent_settings': {
-           'include_dirs': [
-             '<(SHARED_INTERMEDIATE_DIR)/ui/gfx',
-           ],
-         },
          'sources': [
            '../android/java/src/org/chromium/ui/gfx/BitmapHelper.java',
            '../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java',
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 92d05c3..e3cd930 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -570,9 +570,6 @@
           'dependencies': [
             'ui_base_jni_headers',
           ],
-          'include_dirs': [
-            '<(SHARED_INTERMEDIATE_DIR)/ui',
-          ],
           'link_settings': {
             'libraries': [
               '-ljnigraphics',
@@ -618,11 +615,6 @@
          {
            'target_name': 'ui_base_jni_headers',
            'type': 'none',
-           'direct_dependent_settings': {
-             'include_dirs': [
-               '<(SHARED_INTERMEDIATE_DIR)/ui',
-             ],
-           },
            'sources': [
              'android/java/src/org/chromium/ui/base/Clipboard.java',
              'android/java/src/org/chromium/ui/base/LocalizationUtils.java',