From 1dfc74724f2acfefbb4d783c65511d6a3f74cd9f Mon Sep 17 00:00:00 2001 From: ppi Date: Thu, 18 Dec 2014 09:43:13 -0800 Subject: Rewrite the Android implementation of BatteryMonitor directly in Java. This patch introduces a standalone Android implementation of the BatteryMonitor service. New implementation is written in Java without any JNI code, and is made available in the render process host using the Java ServiceRegistry. BUG=420623 Review URL: https://codereview.chromium.org/641703002 Cr-Commit-Position: refs/heads/master@{#309029} --- android_webview/java_library_common.mk | 6 ++++++ android_webview/libwebviewchromium.gypi | 8 +++++--- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'android_webview') diff --git a/android_webview/java_library_common.mk b/android_webview/java_library_common.mk index 2dc1a1f..48762a6 100644 --- a/android_webview/java_library_common.mk +++ b/android_webview/java_library_common.mk @@ -19,6 +19,7 @@ LOCAL_SRC_FILES += \ ../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStoreCallbacks.aidl \ ../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStore.aidl \ $(call all-java-files-under, ../base/android/java/src) \ + $(call all-java-files-under, ../device/battery/android/java/src) \ $(call all-java-files-under, ../media/base/android/java/src) \ $(call all-java-files-under, ../mojo/android/system/src) \ $(call all-java-files-under, ../mojo/public/java/bindings/src) \ @@ -71,6 +72,11 @@ $(call intermediates-dir-for,GYP,shared)/enums/text_input_type_java/org/chromium $(call intermediates-dir-for,GYP,shared)/enums/touch_device_types_java/org/chromium/ui/base/HoverType.java \ $(call intermediates-dir-for,GYP,shared)/enums/touch_device_types_java/org/chromium/ui/base/PointerType.java \ $(call intermediates-dir-for,GYP,shared)/templates/net_errors_java/org/chromium/net/NetError.java \ +$(call intermediates-dir-for,GYP,shared)/java_mojo/device_battery_mojo_bindings/src/org/chromium/mojom/device/BatteryMonitor.java \ +$(call intermediates-dir-for,GYP,shared)/java_mojo/device_battery_mojo_bindings/src/org/chromium/mojom/device/BatteryMonitor_Internal.java \ +$(call intermediates-dir-for,GYP,shared)/java_mojo/device_battery_mojo_bindings/src/org/chromium/mojom/device/BatteryStatus.java \ +$(call intermediates-dir-for,GYP,shared)/java_mojo/device_battery_mojo_bindings/src/org/chromium/mojom/device/BatteryStatusObserver.java \ +$(call intermediates-dir-for,GYP,shared)/java_mojo/device_battery_mojo_bindings/src/org/chromium/mojom/device/BatteryStatusObserver_Internal.java # content dependencies on java components that are provided by the system on # android diff --git a/android_webview/libwebviewchromium.gypi b/android_webview/libwebviewchromium.gypi index 8f5dbe9..49a2ef0 100644 --- a/android_webview/libwebviewchromium.gypi +++ b/android_webview/libwebviewchromium.gypi @@ -9,10 +9,10 @@ ], 'conditions': [ [ 'android_webview_build==1', { - # When building inside the android tree we also need to depend on all - # the java sources generated from templates which will be needed by - # android_webview_java in android_webview/java_library_common.mk. 'dependencies': [ + # When building inside the android tree we also need to depend on all + # the java sources generated from templates which will be needed by + # android_webview_java in android_webview/java_library_common.mk. '../base/base.gyp:base_java_application_state', '../base/base.gyp:base_java_library_load_from_apk_status_codes', '../base/base.gyp:base_java_memory_pressure_level', @@ -37,6 +37,8 @@ '../ui/android/ui_android.gyp:window_open_disposition_java', '../ui/android/ui_android.gyp:text_input_type_java', '../ui/touch_selection/ui_touch_selection.gyp:selection_event_type_java', + # We also need to depend on the Java bindings generated from the .mojom files. + '../device/battery/battery.gyp:device_battery_mojo_bindings_for_webview', ], # Enable feedback-directed optimisation for the library when building in # android. -- cgit v1.1