This repository has been archived by the owner on Apr 3, 2020. It is now read-only.
JDK7-related fixes. #60
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix building with Java 7
javap includes type parameters in Java 7, causing jni_generator.py to
generate invalid C++ code. Fix by stripping away anything after a '<'.
BUG=
Review URL: https://chromiumcodereview.appspot.com/23587011
android/gyp/jar_toc.py: avoid specifying conflicting flags.
http://docs.oracle.com/javase/6/docs/technotes/tools/windows/javap.html
says:
-protected Shows only protected and public classes and members.
So there's no need to specify both -protected and -public.
Needed because in JDK7 javap is more particular about its flags and
rejects this
particular combination.
BUG=https://code.google.com/p/webrtc/issues/detail?id=2034
Review URL: https://chromiumcodereview.appspot.com/19244003
|
LGTM. |
rakuco
added a commit
that referenced
this pull request
Sep 6, 2013
JDK7-related fixes. I've been trying to build Crosswalk for Android using JDK7, as these days it looks like downloading JDK6 from Oracle's website requires an oracle.com account. The two patches in this series bring in some commits in Chromium trunk that have not been backported to branches yet that fix the build with JDK7.
darktears
pushed a commit
that referenced
this pull request
Sep 29, 2014
…hset #5 id:100001 of https://codereview.chromium.org/516293007/) Reason for revert: Chrome OS build with DCHECKs enabled fails on start. This CL breaks assumption, that GAIA extension can be loaded without performing IO-operations. Log and stack trace: [16275:16275:0903/161435:WARNING:renderer_freezer.cc(55)] Cgroup freezer does not exist or is not writable. Processes will not be frozen during suspend. [16275:16275:0903/161435:WARNING:configuration_policy_pref_store.cc(30)] Policy RemoteAccessClientFirewallTraversal: This policy has been deprecated. [16275:16275:0903/161437:FATAL:thread_restrictions.cc(38)] Function marked as IO-only was called from a thread that disallows IO! If this thread really should be allowed to make IO calls, adjust the call to base::ThreadRestrictions::SetIOAllowed() in this thread's startup. #0 0x7fe3122e555e base::debug::StackTrace::StackTrace() #1 0x7fe31237c462 logging::LogMessage::~LogMessage() #2 0x7fe3124824af base::ThreadRestrictions::AssertIOAllowed() #3 0x7fe3123630a1 base::PathExists() #4 0x7fe321cfd5f3 extensions::(anonymous namespace)::CollectPlatformSpecificResourceArchs() #5 0x7fe321cfad22 extensions::Extension::InitFromValue() #6 0x7fe321cfa490 extensions::Extension::Create() #7 0x7fe321cfa114 extensions::Extension::Create() #8 0x7fe3233ebe1b extensions::ComponentLoader::Load() #9 0x7fe3233ec3cf extensions::ComponentLoader::Add() #10 0x7fe3233ec32a extensions::ComponentLoader::Add() #11 0x7fe3233ec2b0 extensions::ComponentLoader::Add() #12 0x7fe32437505f (anonymous namespace)::LoadGaiaAuthExtension() #13 0x7fe324374d5e extensions::GaiaAuthExtensionLoader::LoadIfNeeded() #14 0x7fe324237f7e ScopedGaiaAuthExtension::ScopedGaiaAuthExtension() #15 0x7fe322f68bb2 chromeos::WebUILoginView::Init() #16 0x7fe322f556ef chromeos::LoginDisplayHostImpl::InitLoginWindowAndView() #17 0x7fe322f52640 chromeos::LoginDisplayHostImpl::LoadURL() #18 0x7fe322f5226a chromeos::LoginDisplayHostImpl::StartWizard() #19 0x7fe322f54acd chromeos::LoginDisplayHostImpl::StartPostponedWebUI() #20 0x7fe322f541f8 chromeos::LoginDisplayHostImpl::Observe() #21 0x7fe322f54bfd chromeos::LoginDisplayHostImpl::Observe() #22 0x7fe31b222377 content::NotificationServiceImpl::Notify() #23 0x7fe322d51a24 chromeos::(anonymous namespace)::UserWallpaperDelegate::OnWallpaperAnimationFinished() #24 0x7fe31188692f ash::RootWindowController::OnWallpaperAnimationFinished() #25 0x7fe3117c633a ash::(anonymous namespace)::ShowWallpaperAnimationObserver::OnImplicitAnimationsCompleted() #26 0x7fe311f72d30 ui::ImplicitAnimationObserver::CheckCompleted() #27 0x7fe311f72cd5 ui::ImplicitAnimationObserver::SetActive() #28 0x7fe311f965d5 ui::ScopedLayerAnimationSettings::~ScopedLayerAnimationSettings() #29 0x7fe3117c5ec7 ash::DesktopBackgroundWidgetController::StartAnimating() #30 0x7fe3117bbb0c ash::DesktopBackgroundController::InstallDesktopController() #31 0x7fe3117bbc03 ash::DesktopBackgroundController::InstallDesktopControllerForAllWindows() #32 0x7fe3117bb3cc ash::DesktopBackgroundController::SetDesktopBackgroundImageMode() #33 0x7fe3117bb096 ash::DesktopBackgroundController::SetWallpaperImage() #34 0x7fe322f9a6b9 chromeos::WallpaperManager::DoSetDefaultWallpaper() #35 0x7fe322f99b73 chromeos::WallpaperManager::PendingWallpaper::ProcessRequest() #36 0x7fe322fbac72 base::internal::RunnableAdapter<>::Run() #37 0x7fe322fbabe9 base::internal::InvokeHelper<>::MakeItSo() #38 0x7fe322fbaba5 base::internal::Invoker<>::Run() #39 0x7fe3122cc9ce base::Callback<>::Run() #40 0x7fe312488f86 base::Timer::RunScheduledTask() #41 0x7fe3124890bc base::BaseTimerTaskInternal::Run() #42 0x7fe312489382 base::internal::RunnableAdapter<>::Run() #43 0x7fe3124892ec base::internal::InvokeHelper<>::MakeItSo() #44 0x7fe312489295 base::internal::Invoker<>::Run() #45 0x7fe3122cc9ce base::Callback<>::Run() #46 0x7fe3122eb9b3 base::debug::TaskAnnotator::RunTask() #47 0x7fe3123a1c57 base::MessageLoop::RunTask() #48 0x7fe3123a1d9b base::MessageLoop::DeferOrRunPendingTask() #49 0x7fe3123a228d base::MessageLoop::DoDelayedWork() #50 0x7fe3122a1f25 base::MessagePumpGlib::Run() #51 0x7fe3123a17f0 base::MessageLoop::RunHandler() #52 0x7fe3124093b2 base::RunLoop::Run() #53 0x7fe324217e4d ChromeBrowserMainParts::MainMessageLoopRun() #54 0x7fe31ad2a8bf content::BrowserMainLoop::RunMainMessageLoopParts() #55 0x7fe31ad344c7 content::BrowserMainRunnerImpl::Run() #56 0x7fe31ad251b1 content::BrowserMain() #57 0x7fe31abb997f content::RunNamedProcessTypeMain() #58 0x7fe31abbcce8 content::ContentMainRunnerImpl::Run() #59 0x7fe31abb8ee5 content::ContentMain() #60 0x7fe3206d3505 ChromeMain #61 0x7fe3206d34b2 main Cannot upload crash dump: cannot exec /sbin/crash_reporter Crash_reporter failed to process crash report Original issue's description: > Enable forced extension updates on NaCl arch mismatch > > This makes extensions aware of the platforms for which > they have platform-specific resources installed, if any. > > This also hooks up the extension update code with some > additional logic to place an extension in forced-update > mode if it has platform-specific resources which don't > match the current NaCl architecture. > > BUG=409948 > TEST=install an extension which uses NaCl (QuickOffice for example). Rename the _platform-specific/<your-nacl-arch> directory some something else and force an update (e.g. via chrome://extensions button). Observe that a new CRX is downloaded and installed. > > Committed: https://chromium.googlesource.com/chromium/src/+/4a92281fa5d331860d65a59ba45dc882a5c71df4 [email protected],[email protected],[email protected],[email protected] NOTREECHECKS=true NOTRY=true BUG=409948 Review URL: https://codereview.chromium.org/532183003 Cr-Commit-Position: refs/heads/master@{#293128}
rakuco
pushed a commit
that referenced
this pull request
Oct 10, 2014
…ot visible) in chrome Android, we stop sending captured video frame, but still hold the camera, this makes camera can not be used by other apps. This patch releases the camera on pause, and allocate it again when resume, since SuspendDevices() is only called in Android, this is Android only behavior. BUG=417659 TBR=tommi,tsepez Review URL: https://codereview.chromium.org/615043006 Cr-Commit-Position: refs/heads/master@{#297933} Review URL: https://codereview.chromium.org/627033004 Cr-Commit-Position: refs/branch-heads/2171@{#60} Cr-Branched-From: 267aeeb-refs/heads/master@{#297060}
mrunalk
pushed a commit
that referenced
this pull request
Feb 10, 2015
This fixes a bug where entering Reader Mode would cause the URL bar to gain focus. The problem was that, starting in https://crrev.com/821393004, Tab.destroyContentViewCore() was removing the ContentView from the view hierarchy. This caused focus to go immediately to the URL bar. BUG=447203 Review URL: https://codereview.chromium.org/833403004 Cr-Commit-Position: refs/heads/master@{#311620} (cherry picked from commit 7c0fea8) Review URL: https://codereview.chromium.org/862733002 Cr-Commit-Position: refs/branch-heads/2272@{#60} Cr-Branched-From: 827a380-refs/heads/master@{#310958}
rakuco
pushed a commit
that referenced
this pull request
Mar 12, 2015
They are demo applications introducing popular apps/services. The new demos use the same template with existing demo apps. Text/images are replaced for each new application. BUG=446429 TEST=None [email protected] Review URL: https://codereview.chromium.org/941273002 Cr-Commit-Position: refs/heads/master@{#318401} (cherry picked from commit 4f26a76) Review URL: https://codereview.chromium.org/966333002 Cr-Commit-Position: refs/branch-heads/2311@{#60} Cr-Branched-From: 09b7de5-refs/heads/master@{#317474}
rakuco
pushed a commit
that referenced
this pull request
Apr 15, 2015
For auto-launched kiosk apps permissions are granted automatically, without a user consent. In such case a notification will be shown though. [email protected] TEST=unit_tests: *FileSystemApiConsentProviderTest* BUG=440674 Review URL: https://codereview.chromium.org/1032313002 Cr-Commit-Position: refs/heads/master@{#324169} (cherry picked from commit 232bdea) Review URL: https://codereview.chromium.org/1058873008 Cr-Commit-Position: refs/branch-heads/2357@{#60} Cr-Branched-From: 59d4494-refs/heads/master@{#323860}
rakuco
pushed a commit
that referenced
this pull request
Jun 8, 2015
BUG=488666 Add spoken feedback but no visible text to button that leads to "Add supervised user" Review URL: https://codereview.chromium.org/1125373004 Cr-Commit-Position: refs/heads/master@{#330532} (cherry picked from commit 8e8e7c6) NOTRY=True [email protected] Review URL: https://codereview.chromium.org/1153683002 Cr-Commit-Position: refs/branch-heads/2403@{#60} Cr-Branched-From: f54b809-refs/heads/master@{#330231}
mrunalk
pushed a commit
that referenced
this pull request
Dec 18, 2015
Previously uploads that are user-permitted but not network-permitted get ignored when it comes to retry scheduling. This fix makes them eligible for retry. * Use isUploadUserPermitted just to check user preference, so that uploads that only failed this check may be retried in the future. * Delete crash dump if user does not permit uploads. This makes sure that uploads returning UPLOAD_DISABLED do not get retried, ever. Also deleted obsolete code and fixed a TAG prefix. BUG=553488 [email protected] NOTRY=true NOPRESUBMIT=true (cherry picked from commit 95b02f0) Review URL: https://codereview.chromium.org/1456833004 Cr-Commit-Position: refs/branch-heads/2564@{#60} Cr-Branched-From: 1283eca-refs/heads/master@{#359700}
huningxin
pushed a commit
to huningxin/chromium-croswalk
that referenced
this pull request
May 17, 2016
…le device id has fixed the following issue: During the mirror mode, if HDMI node is set as non-active node by user's choice, after the device is suspended then resumed, during the suspend/resume, the hdmi node is lost then re-appeared with the different id, the hdmi node becomes the active node, which overrides the user's choice." This reverts commit 639ec6f. Merge remote-tracking branch 'refs/remotes/branch-heads/2661' into branch_2661 Revert "Expose stable_device_id in audio extension apis." This reverts commit 2ae95ec. Revert "Initialize stable_device_id for fake devices created by FakeCrasAudioClient::Init()" This reverts commit adbc6b1. BUG=308143 [email protected] Review URL: https://codereview.chromium.org/1764543002 . Cr-Commit-Position: refs/branch-heads/2661@{crosswalk-project#60} Cr-Branched-From: ef6f6ae-refs/heads/master@{#378081}
huningxin
pushed a commit
to huningxin/chromium-croswalk
that referenced
this pull request
Oct 9, 2016
AndroidVideoDecodeAccelerator would clear references to pending bitstream buffers in ::Reset and, implicitly, in the destructor. However, each of those may have a file descriptor for shared memory that isn't closed. During a seek, for example, this can cause leaks. This CL wraps the queue of pending bitstream buffers with a new BitstreamRecord type, which has a unique_ptr to the (unmapped) shared memory region, if any. This will automatically close the underlying handle when the unique_ptr is released. Note that no expensive operation is performed in creating the shared memory region. Unless it is later mapped, it just keeps the handle and ::close()s it on destruction. This is a merge of https://codereview.chromium.org/2011653002 . BUG=614489 TEST=observed /proc/fd/[gpu process] while seeking in a video NOPRESUBMIT=true NOTRY=true [email protected] Review-Url: https://codereview.chromium.org/2008373003 Cr-Commit-Position: refs/branch-heads/2743@{crosswalk-project#60} Cr-Branched-From: 2b3ae3b-refs/heads/master@{#394939}
imreotto
pushed a commit
to tenta-browser/chromium-crosswalk
that referenced
this pull request
Nov 2, 2017
CrasAudioHandler is not thread safe. Its member variables
should be only accessed from browser main thread.
BUG=chromium:669239
TEST=Play youtube video. Plug/unplug headsets.
Run media_unittests and chromeos_unittests.
[email protected]
(cherry picked from commit 88c1b13)
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: I414b40eb09c7c0dcb45be2b78db93efe46162573
Reviewed-on: https://chromium-review.googlesource.com/637512
Commit-Queue: Wu-Cheng Li <[email protected]>
Reviewed-by: Max Morin <[email protected]>
Reviewed-by: Jenny Zhang <[email protected]>
Cr-Original-Commit-Position: refs/heads/master@{#499393}
Reviewed-on: https://chromium-review.googlesource.com/654402
Reviewed-by: Wu-Cheng Li <[email protected]>
Cr-Commit-Position: refs/branch-heads/3202@{crosswalk-project#60}
Cr-Branched-From: fa6a5d8-refs/heads/master@{#499098}
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I've been trying to build Crosswalk for Android using JDK7, as these days it
looks like downloading JDK6 from Oracle's website requires an oracle.com
account.
The two patches in this series bring in some commits in Chromium trunk that
have not been backported to branches yet that fix the build with JDK7.