Index: content/content_jni.gypi |
diff --git a/content/content_jni.gypi b/content/content_jni.gypi |
index ba35902a70dc34949c7e88891916de46233ae05b..60c8c3a51629057169769719625aa1d4cb49ceec 100644 |
--- a/content/content_jni.gypi |
+++ b/content/content_jni.gypi |
@@ -7,53 +7,31 @@ |
# require specifying the java directory and generate the rest. |
# TODO(jrg): when doing the above, make sure we support multiple |
# output directories (e.g. browser/jni and common/jni if needed). |
+ 'sources': [ |
+ 'public/android/java/src/org/chromium/content/app/ContentMain.java', |
+ 'public/android/java/src/org/chromium/content/app/LibraryLoader.java', |
+ 'public/android/java/src/org/chromium/content/app/SandboxedProcessService.java', |
+ 'public/android/java/src/org/chromium/content/app/UserAgent.java', |
+ 'public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java', |
+ 'public/android/java/src/org/chromium/content/browser/ContentSettings.java', |
+ 'public/android/java/src/org/chromium/content/browser/ContentVideoView.java', |
+ 'public/android/java/src/org/chromium/content/browser/ContentViewClient.java', |
+ 'public/android/java/src/org/chromium/content/browser/ContentViewCore.java', |
+ 'public/android/java/src/org/chromium/content/browser/ContentViewStatics.java', |
+ 'public/android/java/src/org/chromium/content/browser/DeviceOrientation.java', |
+ 'public/android/java/src/org/chromium/content/browser/DownloadController.java', |
+ 'public/android/java/src/org/chromium/content/browser/LocationProvider.java', |
+ 'public/android/java/src/org/chromium/content/browser/RemoteDebuggingController.java', |
+ 'public/android/java/src/org/chromium/content/browser/SandboxedProcessLauncher.java', |
+ 'public/android/java/src/org/chromium/content/browser/TouchPoint.java', |
+ 'public/android/java/src/org/chromium/content/common/CommandLine.java', |
+ 'public/android/java/src/org/chromium/content/common/DeviceInfo.java', |
+ 'public/android/java/src/org/chromium/content/common/SurfaceCallback.java', |
+ 'public/android/java/src/org/chromium/content/common/SurfaceTextureListener.java', |
+ 'public/android/java/src/org/chromium/content/common/TraceEvent.java', |
+ ], |
'variables': { |
- 'java_sources': [ |
- 'public/android/java/src/org/chromium/content/app/ContentMain.java', |
- 'public/android/java/src/org/chromium/content/app/LibraryLoader.java', |
- 'public/android/java/src/org/chromium/content/app/SandboxedProcessService.java', |
- 'public/android/java/src/org/chromium/content/app/UserAgent.java', |
- 'public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java', |
- 'public/android/java/src/org/chromium/content/browser/ContentSettings.java', |
- 'public/android/java/src/org/chromium/content/browser/ContentVideoView.java', |
- 'public/android/java/src/org/chromium/content/browser/ContentViewClient.java', |
- 'public/android/java/src/org/chromium/content/browser/ContentViewCore.java', |
- 'public/android/java/src/org/chromium/content/browser/ContentViewStatics.java', |
- 'public/android/java/src/org/chromium/content/browser/DeviceOrientation.java', |
- 'public/android/java/src/org/chromium/content/browser/DownloadController.java', |
- 'public/android/java/src/org/chromium/content/browser/LocationProvider.java', |
- 'public/android/java/src/org/chromium/content/browser/RemoteDebuggingController.java', |
- 'public/android/java/src/org/chromium/content/browser/SandboxedProcessLauncher.java', |
- 'public/android/java/src/org/chromium/content/browser/TouchPoint.java', |
- 'public/android/java/src/org/chromium/content/common/CommandLine.java', |
- 'public/android/java/src/org/chromium/content/common/DeviceInfo.java', |
- 'public/android/java/src/org/chromium/content/common/SurfaceCallback.java', |
- 'public/android/java/src/org/chromium/content/common/SurfaceTextureListener.java', |
- 'public/android/java/src/org/chromium/content/common/TraceEvent.java', |
- ], |
- 'jni_headers': [ |
- '<(SHARED_INTERMEDIATE_DIR)/content/jni/content_main_jni.h', |
- '<(SHARED_INTERMEDIATE_DIR)/content/jni/library_loader_jni.h', |
- '<(SHARED_INTERMEDIATE_DIR)/content/jni/sandboxed_process_service_jni.h', |
- '<(SHARED_INTERMEDIATE_DIR)/content/jni/user_agent_jni.h', |
- '<(SHARED_INTERMEDIATE_DIR)/content/jni/android_browser_process_jni.h', |
- '<(SHARED_INTERMEDIATE_DIR)/content/jni/content_settings_jni.h', |
- '<(SHARED_INTERMEDIATE_DIR)/content/jni/content_video_view_jni.h', |
- '<(SHARED_INTERMEDIATE_DIR)/content/jni/content_view_client_jni.h', |
- '<(SHARED_INTERMEDIATE_DIR)/content/jni/content_view_core_jni.h', |
- '<(SHARED_INTERMEDIATE_DIR)/content/jni/content_view_statics_jni.h', |
- '<(SHARED_INTERMEDIATE_DIR)/content/jni/device_orientation_jni.h', |
- '<(SHARED_INTERMEDIATE_DIR)/content/jni/download_controller_jni.h', |
- '<(SHARED_INTERMEDIATE_DIR)/content/jni/location_provider_jni.h', |
- '<(SHARED_INTERMEDIATE_DIR)/content/jni/remote_debugging_controller_jni.h', |
- '<(SHARED_INTERMEDIATE_DIR)/content/jni/sandboxed_process_launcher_jni.h', |
- '<(SHARED_INTERMEDIATE_DIR)/content/jni/touch_point_jni.h', |
- '<(SHARED_INTERMEDIATE_DIR)/content/jni/command_line_jni.h', |
- '<(SHARED_INTERMEDIATE_DIR)/content/jni/device_info_jni.h', |
- '<(SHARED_INTERMEDIATE_DIR)/content/jni/surface_callback_jni.h', |
- '<(SHARED_INTERMEDIATE_DIR)/content/jni/surface_texture_listener_jni.h', |
- '<(SHARED_INTERMEDIATE_DIR)/content/jni/trace_event_jni.h', |
- ], |
+ 'jni_gen_dir': 'content' |
}, |
'includes': [ '../build/jni_generator.gypi' ], |
} |