Make Google API keys available for the Java codebase

build/android/java_google_api_keys.gypi

Index: build/android/java_google_api_keys.gypi
diff --git a/build/android/java_cpp_enum.gypi b/build/android/java_google_api_keys.gypi
similarity index 50%
copy from build/android/java_cpp_enum.gypi
copy to build/android/java_google_api_keys.gypi
index d4abafa812f95e753eb93a5b57ef3eba059e2cd5..bc9b2d160760f099a98a8df03cd7ea9f48b35d89 100644
--- a/build/android/java_cpp_enum.gypi
+++ b/build/android/java_google_api_keys.gypi
@@ -3,17 +3,13 @@
 # found in the LICENSE file.
 
 # This file is meant to be included into a target to provide an action
-# to generate Java source files from a C++ header file containing annotated
-# enum definitions using a Python script.
+# to generate Java source files from the Google API keys using a Python script.
 #
 # To use this, create a gyp target with the following form:
 #  {
-#    'target_name': 'bitmap_format_java',
+#    'target_name': 'google_api_keys_java',
 #    'type': 'none',
-#    'variables': {
-#      'source_file': 'ui/android/bitmap_format.h',
-#    },
-#    'includes': [ '../build/android/java_cpp_enum.gypi' ],
+#    'includes': [ '../build/android/java_google_api_keys.gypi' ],
 #  },
 #
 # Then have the gyp target which compiles the java code depend on the newly
@@ -22,9 +18,9 @@
 {
   'variables': {
     # Location where all generated Java sources will be placed.
-    'output_dir': '<(SHARED_INTERMEDIATE_DIR)/enums/<(_target_name)',
-    'generator_path': '<(DEPTH)/build/android/gyp/java_cpp_enum.py',
-    'generator_args': '<(output_dir) <(source_file)',
+    'output_dir': '<(SHARED_INTERMEDIATE_DIR)/java_google_api_keys',
+    'generator_path': '<(DEPTH)/build/android/gyp/java_google_api_keys.py',
+    'generator_args': '<(output_dir)',
   },
   'direct_dependent_settings': {
     'variables': {
@@ -35,30 +31,25 @@
       ],
       # Ensure that the targets depending on this one are rebuilt if the sources
       # of this one are modified.
-      'additional_input_paths': [
-        '<(source_file)',
-      ],
+      #'additional_input_paths': [
+      #  '<(source_file)',

[agrieve, 2015/10/30 00:55:13]

meant to be commented out?

[dvh, 2015/10/30 20:56:20]

I removed it.

+      #],
     },
   },
   'actions': [
     {
-      'action_name': 'generate_java_constants',
+      'action_name': 'generate_java_google_api_keys',
       'inputs': [
-        '<(DEPTH)/build/android/gyp/util/build_utils.py',
+        '<(DEPTH)/build/android/gyp/java_google_api_keys.py',
         '<(generator_path)',
-        '<(source_file)',
       ],
       'outputs': [
-        # This is the main reason this is an action and not a rule. Gyp doesn't
-        # properly expand RULE_INPUT_PATH here and so it's impossible to
-        # calculate the list of outputs.
-        '<!@pymod_do_main(java_cpp_enum --print_output_only '
-            '<@(generator_args))',
+        '<(output_dir)/GoogleAPIKeys.java',
       ],
       'action': [
         'python', '<(generator_path)', '<@(generator_args)'
       ],
-      'message': 'Generating Java from cpp header <(source_file)',
+      'message': 'Generating Java from Google API Keys header',
     },
   ],
 }