Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(81)

Unified Diff: base/BUILD.gn

Issue 237973002: Add generate_jni template (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « BUILD.gn ('k') | build/config/android/rules.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/BUILD.gn
diff --git a/base/BUILD.gn b/base/BUILD.gn
index 5e44c22f66eef872ae9e79a4d8138e2b58977e4a..ff5e95034df0ae9ca338306e7422df5332d6eaba 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -3,6 +3,7 @@
# found in the LICENSE file.
import("//build/config/ui.gni")
+import("//build/config/android/rules.gni")
component("base") {
sources = [
@@ -16,12 +17,16 @@ component("base") {
"allocator/allocator_extension.h",
"allocator/type_profiler_control.cc",
"allocator/type_profiler_control.h",
- "android/activity_status.cc",
- "android/activity_status.h",
+ "android/application_status_listener.cc",
+ "android/application_status_listener.h",
"android/base_jni_registrar.cc",
"android/base_jni_registrar.h",
"android/build_info.cc",
"android/build_info.h",
+ "android/command_line_android.cc",
+ "android/command_line_android.h",
+ "android/content_uri_utils.cc",
+ "android/content_uri_utils.h",
"android/cpu_features.cc",
"android/fifo_utils.cc",
"android/fifo_utils.h",
@@ -39,8 +44,12 @@ component("base") {
"android/jni_registrar.h",
"android/jni_string.cc",
"android/jni_string.h",
+ "android/library_loader/library_loader_hooks.cc",
+ "android/library_loader/library_loader_hooks.h",
"android/memory_pressure_listener_android.cc",
"android/memory_pressure_listener_android.h",
+ "android/java_handler_thread.cc",
+ "android/java_handler_thread.h",
"android/path_service_android.cc",
"android/path_service_android.h",
"android/path_utils.cc",
@@ -682,32 +691,6 @@ component("base") {
"win/wrapped_window_proc.h",
]
- if (is_android) {
- sources -= [
- "debug/stack_trace_posix.cc",
- ]
-
- # TODO(dpranke): crbug.com/360936.
- # These are disabled until we have JNI support on Android.
- sources -= [
- "android/activity_status.cc",
- "android/base_jni_registrar.cc",
- "android/base_jni_registrar.h",
- "android/build_info.cc",
- "android/build_info.h",
- "android/cpu_features.cc",
- "android/important_file_writer_android.cc",
- "android/memory_pressure_listener_android.cc",
- "android/path_service_android.cc",
- "android/path_utils.cc",
- "android/sys_utils.cc",
- "android/trace_event_binding.cc",
- "message_loop/message_pump_android.cc",
- "power_monitor/power_monitor_device_source_android.cc",
- "threading/platform_thread_android.cc",
- ]
- }
-
# TODO(brettw) I don't understand the conditions this file is used.
sources -= [ "files/file_path_watcher_stub.cc" ]
@@ -734,6 +717,17 @@ component("base") {
"//third_party/modp_b64",
]
+ if (is_android) {
+ deps += [
+ ":base_jni_headers",
+ "//third_party/android_tools:cpu_features"
+ ]
+
+ sources -= [
+ "debug/stack_trace_posix.cc",
+ ]
+ }
+
if (is_nacl) {
# These things would otherwise be built on a Posix build but aren't
# supported on NaCl.
@@ -918,3 +912,27 @@ component("i18n") {
# 'optimize': 'max',
#},
}
+
+if (is_android) {
+ generate_jni("base_jni_headers") {
+ sources = [
+ "android/java/src/org/chromium/base/ApplicationStatus.java",
+ "android/java/src/org/chromium/base/BuildInfo.java",
+ "android/java/src/org/chromium/base/CommandLine.java",
+ "android/java/src/org/chromium/base/ContentUriUtils.java",
+ "android/java/src/org/chromium/base/CpuFeatures.java",
+ "android/java/src/org/chromium/base/ImportantFileWriterAndroid.java",
+ "android/java/src/org/chromium/base/library_loader/LibraryLoader.java",
+ "android/java/src/org/chromium/base/MemoryPressureListener.java",
+ "android/java/src/org/chromium/base/JavaHandlerThread.java",
+ "android/java/src/org/chromium/base/PathService.java",
+ "android/java/src/org/chromium/base/PathUtils.java",
+ "android/java/src/org/chromium/base/PowerMonitor.java",
+ "android/java/src/org/chromium/base/SystemMessageHandler.java",
+ "android/java/src/org/chromium/base/SysUtils.java",
+ "android/java/src/org/chromium/base/ThreadUtils.java",
+ "android/java/src/org/chromium/base/TraceEvent.java",
+ ]
+ jni_package = "base"
+ }
+}
« no previous file with comments | « BUILD.gn ('k') | build/config/android/rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698