Revert "Revert "Upgrade to 5.0.71.48"" DO NOT MERGE
This reverts commit f2e3994fa5148cc3d9946666f0b0596290192b0e,
and updates the x64 makefile properly so it doesn't break that
build.
FPIIM-449
Change-Id: Ib83e35bfbae6af627451c926a9650ec57c045605
(cherry picked from commit 109988c7ccb6f3fd1a58574fa3dfb88beaef6632)
diff --git a/build/jni_generator.gypi b/build/jni_generator.gypi
new file mode 100644
index 0000000..72567df
--- /dev/null
+++ b/build/jni_generator.gypi
@@ -0,0 +1,77 @@
+# Copyright (c) 2012 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.
+
+# This file is meant to be included into a target to provide a rule
+# to generate jni bindings for Java-files in a consistent manner.
+#
+# To use this, create a gyp target with the following form:
+# {
+# 'target_name': 'base_jni_headers',
+# 'type': 'none',
+# 'sources': [
+# 'android/java/src/org/chromium/base/BuildInfo.java',
+# ...
+# ...
+# 'android/java/src/org/chromium/base/SystemMessageHandler.java',
+# ],
+# 'variables': {
+# 'jni_gen_package': 'base',
+# },
+# 'includes': [ '../build/jni_generator.gypi' ],
+# },
+#
+# The generated file name pattern can be seen on the "outputs" section below.
+# (note that RULE_INPUT_ROOT is the basename for the java file).
+#
+# See base/android/jni_generator/jni_generator.py for more info about the
+# format of generating JNI bindings.
+
+{
+ 'variables': {
+ 'jni_generator': '<(DEPTH)/base/android/jni_generator/jni_generator.py',
+ 'jni_generator_ptr_type%': 'long',
+ # A comma separated string of include files.
+ 'jni_generator_includes%': (
+ 'base/android/jni_generator/jni_generator_helper.h'
+ ),
+ 'native_exports%': '--native_exports_optional',
+ },
+ 'rules': [
+ {
+ 'rule_name': 'generate_jni_headers',
+ 'extension': 'java',
+ 'inputs': [
+ '<(jni_generator)',
+ ],
+ 'outputs': [
+ '<(SHARED_INTERMEDIATE_DIR)/<(jni_gen_package)/jni/<(RULE_INPUT_ROOT)_jni.h',
+ ],
+ 'action': [
+ '<(jni_generator)',
+ '--input_file',
+ '<(RULE_INPUT_PATH)',
+ '--output_dir',
+ '<(SHARED_INTERMEDIATE_DIR)/<(jni_gen_package)/jni',
+ '--includes',
+ '<(jni_generator_includes)',
+ '--optimize_generation',
+ '<(optimize_jni_generation)',
+ '--ptr_type',
+ '<(jni_generator_ptr_type)',
+ '<(native_exports)',
+ ],
+ 'message': 'Generating JNI bindings from <(RULE_INPUT_PATH)',
+ 'process_outputs_as_sources': 1,
+ },
+ ],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '<(SHARED_INTERMEDIATE_DIR)/<(jni_gen_package)',
+ ],
+ },
+ # This target exports a hard dependency because it generates header
+ # files.
+ 'hard_dependency': 1,
+}
+