Use _target_name instead of package_name for java*.gypi

build/java_aidl.gypi

Index: build/java_aidl.gypi
diff --git a/build/java_aidl.gypi b/build/java_aidl.gypi
index bb8f2b8cdd8afbc2a10ef61567626917cbad323a..2d4ae2ef6e8b72f6dd87501699184f5eb1e99806 100644
--- a/build/java_aidl.gypi
+++ b/build/java_aidl.gypi
@@ -10,7 +10,6 @@
 #   'target_name': 'aidl_aidl-file-name',
 #   'type': 'none',
 #   'variables': {
-#     'package_name': <name-of-package>
 #     'aidl_interface_file': '<interface-path>/<interface-file>.aidl',
 #     'aidl_import_include': '<(DEPTH)/<path-to-src-dir>',
 #   },
@@ -35,16 +34,17 @@
 # TODO(cjhopman): dependents need to rebuild when this target's inputs have changed.
 
 {
-  'direct_dependent_settings': {
-    'variables': {
-      'generated_src_dirs': ['<(SHARED_INTERMEDIATE_DIR)/<(package_name)/aidl/'],
-    },
-  },
   'variables': {
+    'intermediate_dir': '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/aidl',
     'aidl_import_include%': '',
     'additional_aidl_arguments': [],
     'additional_aidl_input_paths': [],
   },
+  'direct_dependent_settings': {
+    'variables': {
+      'generated_src_dirs': ['<(intermediate_dir)/'],
+    },
+  },
   'conditions': [
     ['"<(aidl_import_include)"!=""', {
       'variables': {
@@ -63,7 +63,7 @@
         '<@(additional_aidl_input_paths)',
       ],
       'outputs': [
-        '<(SHARED_INTERMEDIATE_DIR)/<(package_name)/aidl/<(RULE_INPUT_ROOT).java',
+        '<(intermediate_dir)/<(RULE_INPUT_ROOT).java',
       ],
       'action': [
         '<(android_sdk_tools)/aidl',
@@ -71,7 +71,7 @@
         '-p<(aidl_interface_file)',
         '<@(additional_aidl_arguments)',
         '<(RULE_INPUT_PATH)',
-        '<(SHARED_INTERMEDIATE_DIR)/<(package_name)/aidl/<(RULE_INPUT_ROOT).java',
+        '<(intermediate_dir)/<(RULE_INPUT_ROOT).java',
       ],
     },
   ],