Initial commit of the blimp/ folder and target

blimp/blimp.gyp

Index: blimp/blimp.gyp
diff --git a/blimp/blimp.gyp b/blimp/blimp.gyp
new file mode 100644
index 0000000000000000000000000000000000000000..2847156c1501b12a1dd571dce4c80f071ee06349
--- /dev/null
+++ b/blimp/blimp.gyp
@@ -0,0 +1,88 @@
+# Copyright 2015 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.
+
+{
+  'conditions': [
+    # Blimp Client Targets
+    ['OS=="android"', {
+      'targets': [
+        {
+          'target_name': 'libblimp_client',
+          'type': 'shared_library',
+          'dependencies': [
+            'blimp_client_jni_headers',
+            '../base/base.gyp:base',
+            '../ui/gfx/gfx.gyp:gfx_geometry',
+            '../ui/gl/gl.gyp:gl',
+            '../cc/cc.gyp:cc',

[nyquist, 2015/08/19 07:48:06]

Nit: lexicographic sort

[David Trainor- moved to gerrit, 2015/08/21 00:49:46]

Done.

+            '../gpu/gpu.gyp:gl_in_process_context',
+            '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
+            '../gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings',
+            '<(DEPTH)/skia/skia.gyp:skia',
+            '../net/net.gyp:net',
+          ],
+          'include_dirs': [
+            '<(INTERMEDIATE_DIR)',
+          ],
+          'sources': [
+            'client/android/blimp_jni_registrar.cc',
+            'client/android/blimp_jni_registrar.h',
+            'client/android/blimp_library_loader.cc',
+            'client/android/blimp_library_loader.h',
+            'client/android/blimp_view.cc',
+            'client/android/blimp_view.h',
+            'client/android/compositor/blimp_compositor.cc',
+            'client/android/compositor/blimp_compositor.h',
+            'client/android/compositor/blimp_context_provider.cc',
+            'client/android/compositor/blimp_context_provider.h',
+            'client/android/compositor/blimp_output_surface.cc',
+            'client/android/compositor/blimp_output_surface.h',
+            # TODO(dtrainor): For Chromium Compositor Settings.  This should be
+            # eventually removed.
+            '../content/public/common/content_switches.cc',
+          ],
+        },
+        {
+          'target_name': 'blimp_client_jni_headers',
+          'type': 'none',
+          'sources': [
+            'client/android/java/src/org/chromium/blimp/BlimpLibraryLoader.java',
+            'client/android/java/src/org/chromium/blimp/BlimpView.java',
+          ],
+          'variables': {
+            'jni_gen_package': 'blimp',
+          },
+          'includes': [ '../build/jni_generator.gypi' ],
+        },
+        {
+          'target_name': 'blimp_client_manifest',
+          'type': 'none',
+          'variables': {
+            'jinja_inputs': [ 'client/android/AndroidManifest.xml.jinja2' ],
+            'jinja_output': '<(SHARED_INTERMEDIATE_DIR)/blimp_manifest/AndroidManifest.xml',
+          },
+          'includes': [ '../build/android/jinja_template.gypi' ],
+        },
+        {
+          'target_name': 'blimp_apk',
+          'type': 'none',
+          'dependencies': [
+            'blimp_client_manifest',
+            'libblimp_client',
+            '../base/base.gyp:base_java',
+          ],
+          'variables': {
+            'apk_name': 'Blimp',

[Wez, 2015/08/27 02:01:50]

nit: Do we want the APK name capitalized in this way? Is there a convention
requiring it, for example?

[David Trainor- moved to gerrit, 2015/09/03 06:33:20]

Ah sorry I missed this comment earlier.  I took a look through Chromium and all
apk names seem to start with capital letters for each word (ChromeShell,
ChromePublic, Chrome, etc.).

+            'manifest_package_name': 'org.chromium.blimp',
+            'android_manifest_path': '<(SHARED_INTERMEDIATE_DIR)/blimp_manifest/AndroidManifest.xml',
+            'java_in_dir': 'client/android/java',
+            'resource_dir': 'client/android/java/res',
+            'native_lib_target': 'libblimp_client',
+          },
+          'includes': [ '../build/java_apk.gypi' ],
+        },
+      ],
+    }],  # OS=="android"
+  ]
+}