summaryrefslogtreecommitdiffstats
path: root/android_webview/java_library_common.mk
diff options
context:
space:
mode:
authorppi <ppi@chromium.org>2014-12-18 09:43:13 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-18 17:43:33 +0000
commit1dfc74724f2acfefbb4d783c65511d6a3f74cd9f (patch)
tree5caf0fb697d32e1f1dc4388f7d12251b0e33846f /android_webview/java_library_common.mk
parentd75cf36e6fcd69ef5790061cce45bd84350fbac0 (diff)
downloadchromium_src-1dfc74724f2acfefbb4d783c65511d6a3f74cd9f.zip
chromium_src-1dfc74724f2acfefbb4d783c65511d6a3f74cd9f.tar.gz
chromium_src-1dfc74724f2acfefbb4d783c65511d6a3f74cd9f.tar.bz2
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}
Diffstat (limited to 'android_webview/java_library_common.mk')
-rw-r--r--android_webview/java_library_common.mk6
1 files changed, 6 insertions, 0 deletions
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