summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--content/browser/accessibility/dump_accessibility_tree_browsertest.cc1
-rw-r--r--content/browser/download/mhtml_generation_browsertest.cc1
-rw-r--r--content/browser/encrypted_media_browsertest.cc1
-rw-r--r--content/content.gyp5
-rw-r--r--content/content_app.gypi3
-rw-r--r--content/content_browser.gypi3
-rw-r--r--content/content_shell.gypi11
-rw-r--r--content/content_tests.gypi35
-rw-r--r--content/test/layout_browsertest.cc2
-rw-r--r--webkit/media/crypto/ppapi/clear_key_cdm.cc7
10 files changed, 54 insertions, 15 deletions
diff --git a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
index 27c9e47..0422146 100644
--- a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
+++ b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
@@ -6,6 +6,7 @@
#include <string>
#include <vector>
+#include "base/file_util.h"
#include "base/logging.h"
#include "base/path_service.h"
#include "base/string_split.h"
diff --git a/content/browser/download/mhtml_generation_browsertest.cc b/content/browser/download/mhtml_generation_browsertest.cc
index 6d21e76..75f7aaf 100644
--- a/content/browser/download/mhtml_generation_browsertest.cc
+++ b/content/browser/download/mhtml_generation_browsertest.cc
@@ -4,6 +4,7 @@
#include "base/bind.h"
#include "base/file_path.h"
+#include "base/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/run_loop.h"
#include "content/public/browser/web_contents.h"
diff --git a/content/browser/encrypted_media_browsertest.cc b/content/browser/encrypted_media_browsertest.cc
index 1d32e1d..547386b 100644
--- a/content/browser/encrypted_media_browsertest.cc
+++ b/content/browser/encrypted_media_browsertest.cc
@@ -4,6 +4,7 @@
#include "base/basictypes.h"
#include "base/command_line.h"
+#include "base/file_util.h"
#include "base/path_service.h"
#include "base/string16.h"
#include "base/string_util.h"
diff --git a/content/content.gyp b/content/content.gyp
index 52cfdf3..0d011da 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -344,6 +344,11 @@
'surface_texture_jni_headers',
'surface_jni_headers',
],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '<(SHARED_INTERMEDIATE_DIR)/content',
+ ],
+ },
'includes': [ 'content_jni.gypi' ],
},
],
diff --git a/content/content_app.gypi b/content/content_app.gypi
index 6f800e3..dc03208 100644
--- a/content/content_app.gypi
+++ b/content/content_app.gypi
@@ -40,9 +40,6 @@
'sources!': [
'app/content_main.cc',
],
- 'include_dirs': [
- '<(SHARED_INTERMEDIATE_DIR)/content',
- ],
'dependencies': [
'content.gyp:content_jni_headers',
'../skia/skia.gyp:skia',
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index e93a2a2..7caddfc 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -1043,9 +1043,6 @@
'-ljnigraphics',
],
},
- 'include_dirs': [
- '<(SHARED_INTERMEDIATE_DIR)/content',
- ],
'sources!': [
'browser/geolocation/network_location_provider.cc',
'browser/geolocation/network_location_provider.h',
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 7153cc8..429f0a9 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -167,9 +167,6 @@
'dependencies': [
'content_shell_jni_headers',
],
- 'include_dirs': [
- '<(SHARED_INTERMEDIATE_DIR)/content/shell',
- ],
}, { # else: OS!="android"
'dependencies': [
# This dependency is for running DRT against the content shell, and
@@ -560,6 +557,11 @@
'shell/android/java/src/org/chromium/content_shell/ShellManager.java',
'shell/android/java/src/org/chromium/content_shell/Shell.java',
],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '<(SHARED_INTERMEDIATE_DIR)/content/shell',
+ ],
+ },
'variables': {
'jni_gen_dir': 'content/shell',
},
@@ -577,9 +579,6 @@
'../skia/skia.gyp:skia',
'<(DEPTH)/media/media.gyp:player_android',
],
- 'include_dirs': [
- '<(SHARED_INTERMEDIATE_DIR)/content/shell',
- ],
'sources': [
'shell/android/shell_library_loader.cc',
'shell/android/shell_library_loader.h',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 437d4bc..50ea12a 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -625,7 +625,7 @@
'targets': [
{
'target_name': 'content_browsertests',
- 'type': 'executable',
+ 'type': '<(gtest_target_type)',
'defines!': ['CONTENT_IMPLEMENTATION'],
'dependencies': [
'content_common',
@@ -791,6 +791,26 @@
'browser/accessibility/dump_accessibility_tree_helper.cc',
],
}],
+ ['OS=="android"', {
+ 'sources!': [
+ 'browser/accessibility/dump_accessibility_tree_browsertest.cc',
+ 'browser/accessibility/dump_accessibility_tree_helper.cc',
+ # These are included via dependency on content_common and hence
+ # we get multiple definition errors in a shared library build.
+ # Other builds need it as the symbols are not exported.
+ 'common/content_constants_internal.cc',
+ 'common/content_constants_internal.h',
+ ],
+ 'sources': [
+ 'shell/android/shell_library_loader.cc',
+ 'shell/android/shell_library_loader.cc',
+ 'shell/android/shell_manager.cc',
+ 'shell/android/shell_manager.h',
+ ],
+ 'dependencies': [
+ 'content_shell_jni_headers',
+ ],
+ }],
['OS=="mac"', {
'dependencies': [
'content_shell', # Needed for Content Shell.app's Helper.
@@ -819,6 +839,19 @@
'browser/media/webrtc_browsertest.cc',
],
}],
+ ['enable_plugins==0', {
+ 'sources!': [
+ 'browser/plugin_service_impl_browsertest.cc',
+ 'browser/plugin_data_remover_impl_browsertest.cc',
+ 'renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc',
+ 'renderer/pepper/pepper_file_chooser_host_unittest.cc',
+ ],
+ }],
+ ['input_speech==0', {
+ 'sources/': [
+ ['exclude', '^browser/speech/'],
+ ]
+ }],
],
},
],
diff --git a/content/test/layout_browsertest.cc b/content/test/layout_browsertest.cc
index fa77552..3d38e18 100644
--- a/content/test/layout_browsertest.cc
+++ b/content/test/layout_browsertest.cc
@@ -34,6 +34,8 @@ static const char kPlatformName[] = "chromium-mac";
static const char kPlatformName[] = "chromium-linux";
#elif defined(OS_OPENBSD)
static const char kPlatformName[] = "chromium-openbsd";
+#elif defined(OS_ANDROID)
+static const char kPlatformName[] = "chromium-android";
#else
#error No known OS defined
#endif
diff --git a/webkit/media/crypto/ppapi/clear_key_cdm.cc b/webkit/media/crypto/ppapi/clear_key_cdm.cc
index 22e3445..32f537b 100644
--- a/webkit/media/crypto/ppapi/clear_key_cdm.cc
+++ b/webkit/media/crypto/ppapi/clear_key_cdm.cc
@@ -14,6 +14,7 @@
#include "base/logging.h"
#include "base/time.h"
#include "media/base/decoder_buffer.h"
+#include "webkit/media/crypto/ppapi/cdm_video_decoder.h"
#if defined(CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER)
#include "base/basictypes.h"
@@ -386,9 +387,9 @@ void ClearKeyCdm::DeinitializeDecoder(cdm::StreamType decoder_type) {
video_decoder_->Deinitialize();
break;
case cdm::kStreamTypeAudio:
-#if !defined(CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER)
+#if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER)
audio_decoder_->Deinitialize();
-#else
+#elif defined(CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER)
output_timestamp_base_in_microseconds_ = kNoTimestamp;
total_samples_generated_ = 0;
#endif
@@ -443,6 +444,8 @@ cdm::Status ClearKeyCdm::DecryptAndDecodeSamples(
DCHECK(timestamp_in_microseconds != kNoTimestamp);
}
return GenerateFakeAudioFrames(timestamp_in_microseconds, audio_frames);
+#else
+ return cdm::kSuccess;
#endif // CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER
}
generated by cgit v1.1 at 2025-03-03 20:28:26 +0000