Fix Java file generation rule in java_aidl.gypi

build/java_aidl.gypi

Index: build/java_aidl.gypi
diff --git a/build/java_aidl.gypi b/build/java_aidl.gypi
index 2d383d0bb1293424742cc25d5d1e4eb9c49d1781..d668ce1c42d492483d03cb57cfc51ad4f459a322 100644
--- a/build/java_aidl.gypi
+++ b/build/java_aidl.gypi
@@ -10,19 +10,22 @@
 #   'target_name': 'aidl_aidl-file-name',
 #   'type': 'none',
 #   'variables': {
-#     'aidl_interface_file': 'path/to/aidl/interface/file/aidl-file',
+#     'aidl_interface_file': '<path>/<interface-file>.aidl',
+#     'input_package_path': '<package_path>,
 #   },
 #   'sources': {
-#     'path/to/aidl/source/file/1.aidl',
-#     'path/to/aidl/source/file/2.aidl',
+#     '<path>/<package-path>/<input-file1>.aidl',
+#     '<path>/<package-path>/<input-file2>.aidl',
 #     ...
 #   },
-#   'includes': ['path/to/this/gypi/file'],
+#   'includes': ['<path>/java_aidl.gypi'],
 # }
 #
 #
-# Finally, the generated java file will be in the following directory:
-#   <(PRODUCT_DIR)/lib.java/
+# The generated java files will be:
+#   <(PRODUCT_DIR)/lib.java/<package-path>/<input-file1>.java
+#   <(PRODUCT_DIR)/lib.java/<package-path>/<input-file2>.java
+#   ...
 
 {
   'rules': [
@@ -34,7 +37,7 @@
         '<(aidl_interface_file)',
       ],
       'outputs': [
-        '<(PRODUCT_DIR)/lib.java/<(RULE_INPUT_ROOT).java',
+        '<(PRODUCT_DIR)/lib.java/<(input_package_path)/<(RULE_INPUT_ROOT).java',
       ],
       'action': [
         '<(android_sdk_tools)/aidl',