1218802 - Port Gecko to Android M

Status: RESOLVED WONTFIX

(Firefox OS Graveyard :: General, defect)

Comment 1

[Thomas Zimmermann [:tzimmermann] [:tdz]]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=48d096ed94e3

Comment 2

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: [01] Bug 1218802: Fix order of shared libraries for linking b2g binary

Comment 3

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: [02] Bug 1218802: Fix sign-compare error in gfx/thebes/gfxFT2FontList.cpp

Comment 4

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: [03] Bug 1218802: Define missing macro CONDITION

Comment 5

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: [04] Bug 1218802: Include string.h for |memset| in cubeb_opensl.c

Comment 6

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: [05] Bug 1218802: Initialize NUWA mutex with non-standard initializer

Comment 7

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: [06] Bug 1218802: Include sys/file.h for |flock|

Comment 8

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: [07] Bug 1218802: Support Android M in configure scripts and build system

Comment 9

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: [08] Bug 1218802: Add ui/BufferItem.h to list of system headers

Comment 10

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: [09] Bug 1218802: Support Android M in camera

Comment 11

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: [10] Bug 1218802: Support Android M in OMX decoder

Comment 12

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: [11] Bug 1218802: Support Android M in key store

Comment 13

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: [12] Bug 1218802: Support Android M in RTSP

Comment 14

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: [13] Bug 1218802: Fix |hash_map| namespace on Android M

Comment 15

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: [14] Bug 1218802: Fix profiler on Android M

Comment 16

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: [15] Bug 1218802: Support Android M in Gonk permission service

Comment 17

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: [16] Bug 1218802: Support Android M in libdisplay

Comment 18

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: [17] Bug 1218802: Support Android M in libui

Comment 19

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: [18] Bug 1218802: Copy Lollipop Gonk widget for Android M

Comment 20

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: [19] Bug 1218802: Support Android M in Gonk widget

Comment 21

[Adam Farden [:adfad666]]

I cherry-picked all your changes above, but I get errors on FakeSurfaceComposer.cpp: https://pastebin.mozilla.org/8854580

I'm building on sony-aosp-m - everything of ours cherry-picked onto sony's master branches.

Comment 22

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Hi Adam

(In reply to Adam Farden [:adfad666] from comment #21)
> I cherry-picked all your changes above, but I get errors on
> FakeSurfaceComposer.cpp: https://pastebin.mozilla.org/8854580
> 
> I'm building on sony-aosp-m - everything of ours cherry-picked onto sony's
> master branches.

What you probably have to do is to 'if ANDROID_VERSION'ize the code and distinguish between the old and the new versions.

There's a problem with 'asBinder' in the error messages. That function is part of the Binder framework. It seems like you have to pass an argument to it. That should be the class' pointer, as shown in patch [19]. So 's.surface->asBinder()' becomes 's.surface->asBinder(s.surface)'.

Comment 23

[Adam Farden [:adfad666]]

Some of these patches have become stale, I've updated patch 18/19, but now I'm hitting new errors I didn't see last time. investigating:

In file included from ../../../../gecko/dom/media/omx/MediaOmxCommonReader.cpp:13:0:
../../../../gecko/dom/media/omx/MediaStreamSource.h:23:11: error: 'MediaResourceIndex' in namespace 'mozilla' does not name a type
   typedef mozilla::MediaResourceIndex MediaResourceIndex;
           ^
../../../../gecko/dom/media/omx/MediaStreamSource.h:26:3: error: 'MediaResourceIndex' does not name a type
   MediaResourceIndex mResource;
   ^
../../../../gecko/dom/media/omx/MediaOmxCommonReader.cpp: In member function 'void mozilla::MediaOmxCommonReader::CheckAudioOffload()':
../../../../gecko/dom/media/omx/MediaOmxCommonReader.cpp:60:32: error: invalid use of incomplete type 'class mozilla::MediaResource'
       = mDecoder->GetResource()->IsDataCachedToEndOfResource(0);
                                ^
In file included from ../../../dist/include/MediaDecoderReader.h:11:0,
                 from ../../../../gecko/dom/media/omx/MediaOmxCommonReader.h:10,
                 from ../../../../gecko/dom/media/omx/MediaOmxCommonReader.cpp:7:
../../../dist/include/AbstractMediaDecoder.h:26:7: error: forward declaration of 'class mozilla::MediaResource'
 class MediaResource;
       ^

Comment 24

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Thanks for picking up this patch set. I don't know much about the media code, but it looks like you have to include an additional header file. Recently, there was some work on OMX being done in bug 1203859. Maybe Alfredo can help.

Comment 25

[Adam Farden [:adfad666]]

Actually I discovered that Gecko has a MediaResource.h header but Android Marshmallow now also has a MediaResource.h header in frameworks/av/include/media. It looks like some parts of Gecko are picking the Android header instead of the Gecko header.

Quick HAX to compile:

Symlink MediaResource.h to MediaResource2.h
Add MediaResource2.h to dom/media/moz.build
change the #include in dom/media/omx/MediaOmxReader.h and dom/media/omx/MediaStreamSource.h

What the correct way to pick the Gecko header over the Android header?

Comment 26

[Alfredo Yang (:alfredo)]

(In reply to Adam Farden [:adfad666] from comment #25)
> Actually I discovered that Gecko has a MediaResource.h header but Android
> Marshmallow now also has a MediaResource.h header in
> frameworks/av/include/media. It looks like some parts of Gecko are picking
> the Android header instead of the Gecko header.
> 
> Quick HAX to compile:
> 
> Symlink MediaResource.h to MediaResource2.h
> Add MediaResource2.h to dom/media/moz.build
> change the #include in dom/media/omx/MediaOmxReader.h and
> dom/media/omx/MediaStreamSource.h
> 
> What the correct way to pick the Gecko header over the Android header?

I don't have this problem before. Sotaro, have you met this kind of problem before?

Comment 27

[Sotaro Ikeda [:sotaro]]

(In reply to Alfredo Yang (:alfredo) from comment #26)
> 
> I don't have this problem before. Sotaro, have you met this kind of problem
> before?

I did not face exactly same problem. Bug 1158692 is a bit similar.

To address the problem, we need distinct include path name. To do it, it seems better to remove "-I$gonkdir/frameworks/av/include/media" from configure.in and change "MediaResource.h" to "media/MediaResource.h" or similar longer path name.
  https://dxr.mozilla.org/mozilla-central/source/configure.in#286

Comment 28

[BMO Automation]

Firefox OS is not being worked on