summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
Diffstat (limited to 'content')
-rw-r--r--content/app/BUILD.gn2
-rw-r--r--content/browser/BUILD.gn7
-rw-r--r--content/common/BUILD.gn9
-rw-r--r--content/content_renderer.gypi2
-rw-r--r--content/public/android/BUILD.gn21
-rw-r--r--content/renderer/BUILD.gn1
-rw-r--r--content/shell/BUILD.gn15
-rw-r--r--content/test/BUILD.gn10
8 files changed, 50 insertions, 17 deletions
diff --git a/content/app/BUILD.gn b/content/app/BUILD.gn
index f636d9f..35df02b 100644
--- a/content/app/BUILD.gn
+++ b/content/app/BUILD.gn
@@ -37,7 +37,7 @@ if (is_win) {
} else if (is_android) {
content_app_sources -= [ "content_main.cc" ]
content_app_deps += [
- "//content:content_jni_headers",
+ "//content/public/android:jni",
"//skia",
"//third_party/android_tools:cpu_features"
]
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index da48444..e2f289949 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -49,7 +49,6 @@ source_set("browser") {
"//ui/native_theme",
"//ui/resources",
"//ui/snapshot",
- "//ui/wm",
]
if (is_ios) {
@@ -137,7 +136,7 @@ source_set("browser") {
sources -= [ "renderer_host/web_input_event_aurawin.cc" ]
}
- if (!is_win && !is_mac && (!is_linux || !use_udev)) {
+ if (!is_win && !is_mac && !is_android && (!is_linux || !use_udev)) {
sources += [ "gamepad/gamepad_platform_data_fetcher.cc" ]
}
@@ -261,6 +260,7 @@ source_set("browser") {
} else {
sources -= [
"power_save_blocker_x11.cc",
+ "renderer_host/web_input_event_aurax11.cc",
]
}
@@ -308,7 +308,7 @@ source_set("browser") {
"speech/speech_recognizer_impl.h",
]
deps += [
- #"//content:jni_headers", TODO(GYP)
+ "//content/public/android:jni",
"//media",
]
libs += [ "jnigraphics" ]
@@ -342,6 +342,7 @@ source_set("browser") {
deps += [
"//ui/aura",
"//ui/strings",
+ "//ui/wm",
]
} else { # Not aura.
sources -= [
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index 51766f1..d3e9124 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -106,11 +106,10 @@ source_set("common") {
"gpu/client/gpu_memory_buffer_impl_surface_texture.h",
]
- # TODO(GYP) enable when these targets are converted.
- #deps += [
- # "//content:content_jni_headers",
- # "//content:common_aidl",
- #]
+ deps += [
+ "//content/public/android:jni",
+ "//content/public/android:common_aidl",
+ ]
libs += [ "android" ]
}
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 2b1b7a2..3a99724 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -724,9 +724,7 @@
'sources!': [
'renderer/accessibility/renderer_accessibility_focus_only.cc',
'renderer/media/audio_decoder.cc',
- 'renderer/media/filter_helpers.cc',
'renderer/media/crypto/encrypted_media_player_support_impl.cc',
- 'renderer/media/webmediaplayer_impl.cc',
],
'sources': [
'renderer/external_popup_menu.cc',
diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
index 0755a18..ef9a861 100644
--- a/content/public/android/BUILD.gn
+++ b/content/public/android/BUILD.gn
@@ -5,6 +5,11 @@
import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
+content_jni_gypi_values = exec_script("//build/gypi_to_gn.py",
+ [ rebase_path("../../content_jni.gypi") ],
+ "scope",
+ [ "../../content_jni.gypi" ])
+
android_aidl("common_aidl") {
interface_file = "java/src/org/chromium/content/common/common.aidl"
import_include = "java/src"
@@ -200,11 +205,23 @@ java_cpp_template("content_gamepad_mapping_java") {
]
}
-generate_jar_jni("content_jni_headers") {
+generate_jar_jni("jar_jni") {
jni_package = "content"
classes = [
- "android/view/MotionEvent.class",
"java/util/HashSet.class",
+ "android/view/MotionEvent.class",
+ ]
+}
+
+generate_jni("content_jni_headers") {
+ sources = rebase_path(content_jni_gypi_values.sources, "", "../..")
+ jni_package = "content"
+}
+
+group("jni") {
+ deps = [
+ ":content_jni_headers",
+ ":jar_jni",
]
}
diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
index 57dd73c..06eb947 100644
--- a/content/renderer/BUILD.gn
+++ b/content/renderer/BUILD.gn
@@ -80,6 +80,7 @@ source_set("renderer") {
sources -= [
"accessibility/renderer_accessibility_focus_only.cc",
"media/audio_decoder.cc",
+ "media/crypto/encrypted_media_player_support_impl.cc",
]
sources += [
"external_popup_menu.cc",
diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn
index 6621e63..570d154 100644
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -264,7 +264,7 @@ static_library("content_shell_lib") {
}
if (is_android) {
- deps += [ ":content_shell_jni_headers" ]
+ deps += [ "//content/shell/android:content_shell_jni_headers" ]
#deps -= [ "copy_test_netscape_plugin" ] TODO(GYP)
}
@@ -292,6 +292,11 @@ static_library("content_shell_lib") {
} else {
sources += [ "browser/shell_aura.cc" ]
}
+ } else {
+ sources -= [
+ "browser/shell_platform_data_aura.cc",
+ "browser/shell_platform_data_aura.h",
+ ]
}
# The test plugin relies on X11.
@@ -430,6 +435,9 @@ repack("pak") {
}
}
+# TODO(GYP): Figure out what this should be on android
+if (!is_android) {
+
executable("content_shell") {
testonly = true
# TODO(GYP) mac resource bundle stuff for this target.
@@ -446,7 +454,6 @@ executable("content_shell") {
":content_shell_lib",
":pak",
"//base/allocator",
- "//third_party/mesa:osmesa",
]
if (is_win) {
@@ -461,7 +468,7 @@ executable("content_shell") {
# TODO(GYP) lots of stuff from GYP file here.
}
- if (!is_android || !is_android_webview_build) {
+ if (is_android && !is_android_webview_build) {
# Some tests rely on this tool. It might be nicer if these tests relied on
# image diff rather than having content shell depend on it.
datadeps = [
@@ -469,3 +476,5 @@ executable("content_shell") {
]
}
}
+
+}
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index 42b36db..18c555b 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -163,10 +163,18 @@ if (!is_ios) {
]
if (is_android) {
- #deps += [ "test_support_content_jni_headers" ] TODO(GYP)
+ deps += [ ":jni" ]
}
}
+ if (is_android) {
+ import("//build/config/android/rules.gni")
+
+ generate_jni("jni") {
+ sources = [ "../public/test/android/javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java" ]
+ jni_package = "content/public/test"
+ }
+ }
} # !is_ios
# TODO(GYP): Unit test targets
generated by cgit v1.1 at 2024-09-17 05:31:38 +0000