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..ddbe19ca00c1ae05cec71c77931bd7941614802f
--- /dev/null
+++ b/blimp/blimp.gyp
@@ -0,0 +1,116 @@
+# 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.
+
+{
+  'targets': [
+    {
+      'target_name': 'libblimp_common',
+      'type': 'shared_library',

[Khushal, 2015/08/26 03:30:24]

The target should probably be component. We use the COMPONENT_BUILD variable in
blimp_common_export.h which is defined based on the value of component.

[David Trainor- moved to gerrit, 2015/08/26 05:50:44]

Ah thanks for tracking that down!  I'll change these targets.

+      'dependencies': [
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/cc/cc.gyp:cc',
+        '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
+        '<(DEPTH)/skia/skia.gyp:skia',

[jbudorick, 2015/08/26 18:26:12]

nit: ordering

[David Trainor- moved to gerrit, 2015/08/28 01:23:44]

Done.

+        '<(DEPTH)/ui/gl/gl.gyp:gl',
+      ],
+      'include_dirs': [
+        '<(INTERMEDIATE_DIR)',
+      ],
+      'defines': [
+        'BLIMP_COMMON_IMPLEMENTATION=1',
+      ],
+      'sources': [
+        'common/blimp_common_export.h',
+        'common/compositor/blimp_layer_tree_settings.cc',
+        'common/compositor/blimp_layer_tree_settings.h',
+        # TODO(dtrainor): For CC settings.  This should be eventually removed.

[jbudorick, 2015/08/26 18:26:12]

...eventually?

[David Trainor- moved to gerrit, 2015/08/28 01:23:44]

Turned this into a TODO.

+        '../content/public/common/content_switches.cc',
+      ],
+    },
+    {
+      'target_name': 'libblimp_client',
+      'type': 'shared_library',
+      'dependencies': [
+        'blimp_client_jni_headers',
+        'libblimp_common',
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/cc/cc.gyp:cc',
+        '<(DEPTH)/gpu/gpu.gyp:gl_in_process_context',
+        '<(DEPTH)/gpu/command_buffer/command_buffer.gyp:gles2_utils',
+        '<(DEPTH)/gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings',
+        '<(DEPTH)/skia/skia.gyp:skia',
+        '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
+        '<(DEPTH)/ui/gl/gl.gyp:gl',
+      ],
+      '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/compositor/blimp_compositor.cc',
+        'client/compositor/blimp_compositor.h',
+        'client/compositor/blimp_compositor_android.cc',
+        'client/compositor/blimp_compositor_android.h',
+        'client/compositor/blimp_context_provider.cc',
+        'client/compositor/blimp_context_provider.h',
+        'client/compositor/blimp_output_surface.cc',
+        'client/compositor/blimp_output_surface.h',
+        'client/compositor/blimp_task_graph_runner.cc',
+        'client/compositor/blimp_task_graph_runner.h',
+        'client/compositor/test/dummy_layer_driver.cc',
+        'client/compositor/test/dummy_layer_driver.h',
+      ],
+    },
+  ],
+  'conditions': [
+    ['OS=="android"', {
+      'targets': [
+        {
+          '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',
+            '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"
+  ]
+}