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 9833256a4f1729c5d13f44ca312a863fe1309aa5..45aa4c9d983b592ea56a38c45854b5c3096d3bc7 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',
 #   },
 #   'sources': {
@@ -30,9 +29,12 @@
 # TODO(cjhopman): dependents need to rebuild when this target's inputs have changed.
 
 {
+  'variables': {
+    'intermediate_dir': '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/aidl',
+  },
   'direct_dependent_settings': {
     'variables': {
-      'generated_src_dirs': ['<(SHARED_INTERMEDIATE_DIR)/<(package_name)/aidl/'],
+      'generated_src_dirs': ['<(intermediate_dir)/'],
     },
   },
   'rules': [
@@ -44,14 +46,14 @@
         '<(aidl_interface_file)',
       ],
       'outputs': [
-        '<(SHARED_INTERMEDIATE_DIR)/<(package_name)/aidl/<(RULE_INPUT_ROOT).java',
+        '<(intermediate_dir)/<(RULE_INPUT_ROOT).java',
       ],
       'action': [
         '<(android_sdk_tools)/aidl',
         '-p<(android_sdk)/framework.aidl',
         '-p<(aidl_interface_file)',
         '<(RULE_INPUT_PATH)',
-        '<(SHARED_INTERMEDIATE_DIR)/<(package_name)/aidl/<(RULE_INPUT_ROOT).java',
+        '<(intermediate_dir)/<(RULE_INPUT_ROOT).java',
       ],
     },
   ],