Make Google API keys available for the Java codebase

chrome/android/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build_overrides/v8.gni")
 import("//chrome/version.gni")
 import("//testing/test.gni")
 import("//third_party/icu/config.gni")
@@ skipping 144 matching lines @@
     "//third_party/WebKit/public:blink_headers_java",
     "//media/base/android:media_java",
     "//media/midi:midi_java",
     "//ui/android:ui_java",
     "//ui/android:ui_java_resources",
     google_play_services_library,
   ]
 
   srcjar_deps = [
     ":chrome_android_java_enums_srcjar",
+    ":chrome_android_java_google_api_keys_srcjar",
     ":chrome_version_srcjar",
     ":custom_tabs_service_aidl",
     ":resource_id_javagen",
     "//chrome:page_info_connection_type_javagen",
     "//chrome:content_setting_javagen",
     "//chrome:content_settings_type_javagen",
     "//components/enhanced_bookmarks:enhanced_bookmarks_java_enums_srcjar",
     "//components/offline_pages:offline_pages_enums_java",
   ]
 
   DEPRECATED_java_in_dir = "java/src"
 }
 
 # GYP: //chrome/chrome_browser.gypi:activity_type_ids_java
 # GYP: //chrome/chrome_browser.gypi:connectivity_check_result_java
 # GYP: //chrome/chrome_browser.gypi:shortcut_source_java
 # GYP: //chrome/chrome_browser.gypi:profile_account_management_metrics_java
 # GYP: //chrome/chrome_browser.gypi:connection_security_levels_java
 # GYP: //chrome/chrome_browser.gypi:tab_load_status_java
 # GYP: //chrome/chrome_browser.gypi:infobar_action_type_java
+
+action("google_api_keys_java_file") {
+  visibility = [ ":chrome_android_java_google_api_keys_srcjar" ]
+  script = "//build/android/gyp/java_google_api_keys.py"
+  _gen_dir = "${target_gen_dir}/chrome_android_java_google_api_keys_srcjar/java_google_api_keys"
+  _output_path = rebase_path("GoogleAPIKeys.java", ".", _gen_dir)
+  _output_file = get_path_info(_output_path, "abspath")
+  outputs = [
+    _output_file,
+  ]
+  args = [
+    "--out",
+    _output_path,
+  ]
+}
+
+zip("chrome_android_java_google_api_keys_srcjar") {

[agrieve, 2015/11/03 16:22:42]

yep, this looks good :)

One more thing you should do to simplify though, is to fold zip() into
java_google_api_keys.py.

Can you add a --srcjar arg that works similarly to
https://code.google.com/p/chromium/codesearch#chromium/src/build/android/gyp/...

You should be able to avoid writing intermediate files entirely by using
zipfile.writestr().

You should also use HERMETIC_TIMESTAMP from here:
https://code.google.com/p/chromium/codesearch#chromium/src/build/android/gyp/...

(and also HERMETIC_FILE_ATTR) so that identical .srcjar files will be created
given identical inputs.

The other thing this will fix is that the path should include the java package
name in it, or else compilation with enable_incremental_javac = true will fail.
This doesn't exist for GYP, so just leave as-is for GYP.

Note: I see that java_cpp_enum() doesn't follow my advice here, but I will fix
that up :)

[dvh, 2015/11/03 20:03:54]

Done.

+  inputs = get_target_outputs(":google_api_keys_java_file")
+  output = "${target_gen_dir}/${target_name}.srcjar"
+  base_dir = get_label_info(":google_api_keys_java_file", "target_gen_dir")
+  deps = [
+    ":google_api_keys_java_file",
+  ]
+}
+
 java_cpp_enum("chrome_android_java_enums_srcjar") {
   sources = [
     "//chrome/browser/android/activity_type_ids.h",
     "//chrome/browser/android/feedback/connectivity_checker.cc",
     "//chrome/browser/android/most_visited_sites.cc",
     "//chrome/browser/android/shortcut_info.h",
     "//chrome/browser/android/tab_android.h",
     "//chrome/browser/profiles/profile_metrics.h",
     "//chrome/browser/ssl/security_state_model.h",
     "//chrome/browser/ui/android/infobars/infobar_android.h",
@@ skipping 245 matching lines @@
   # TODO(GYP,cjhopman): Does this need version code/name?
   apk_name = "ChromePublicTest"
   apk_under_test = ":chrome_public_apk"
   android_manifest = chrome_public_test_apk_manifest
   deps = [
     ":chrome_public_test_apk_manifest",
     "//chrome/android:chrome_shared_test_java",
   ]
   isolate_file = "../chrome_public_test_apk.isolate"
 }