Android 8.1.0 Oreo MR1 Released

[Xin Li]

Hi all,

Android 8.1.0 Oreo MR1 source code is now available.  The following builds, tags, and devices are supported:

 - OPM1.171019.011, android-8.1.0_r1, Pixel 2 XL (taimen), Pixel 2 (walleye), Pixel XL (marlin), Pixel (sailfish), Nexus 5X (bullhead), Nexus 6P (angler), Pixel C (dragon)

The corresponding factory images, ota images, and proprietary binaries are available at

   https://developers.google.com/android/images

   https://developers.google.com/android/ota

   https://developers.google.com/android/drivers

We pushed a reference oreo-mr1-dev branch as well as oreo-mr1-release branch.

We have also pushed the corresponding kernel projects for the following devices:

Tag                | Project      | Branch                                 | Device

android-8.1.0_r0.1 | kernel/msm   | android-msm-angler-3.10-oreo-mr1       | Nexus 6P

android-8.1.0_r0.2 | kernel/msm   | android-msm-bullhead-3.10-oreo-mr1     | Nexus 5X

android-8.1.0_r0.3 | kernel/tegra | android-tegra-dragon-3.18-oreo-mr1     | Pixel C

android-8.1.0_r0.4 | kernel/msm   | android-msm-marlin-3.18-oreo-mr1       | Pixel and Pixel XL

android-8.1.0_r0.5 | kernel/msm   | android-msm-wahoo-4.4-oreo-mr1         | Pixel 2 and Pixel 2 XL

android-8.1.0_r0.6 | kernel/msm   | android-easel-intel-linux-4.7-oreo-mr1 | Pixel 2 and Pixel 2 XL

We'll also merge Oreo MR1 into AOSP master.  I'll update this post when each of these become available.

[Xin Li]

We have merged Oreo MR1 into AOSP master.

[Chih-Wei Huang]

Xin Li於 2017年12月6日星期三 UTC+8下午1時28分30秒寫道：

Hi all,

Android 8.1.0 Oreo MR1 source code is now available.  The following builds, tags, and devices are supported:

 - OPM1.171019.011, android-8.1.0_r1, Pixel 2 XL (taimen), Pixel 2 (walleye), Pixel XL (marlin), Pixel (sailfish), Nexus 5X (bullhead), Nexus 6P (angler), Pixel C (dragon)

Oh! This seems the first time you released ONE branch

for all your devices. Great!

Hope you keep the right direction in the future.

(but where is Nexus Player - fugu?)

[Guoyin Chen]

android-8.1.0_r1 cannot pass my build. It seems the native.git has openmax header relocated to frameworks/native/headers/media_plugin/media/openmax. But other git still refer the old header folder.

frameworks/base$ git diff

diff --git a/media/jni/Android.bp b/media/jni/Android.bp

index 02667ca..fff7045 100644

--- a/media/jni/Android.bp

+++ b/media/jni/Android.bp

@@ -64,7 +64,7 @@ cc_library_shared {

     include_dirs: [

         "frameworks/base/core/jni",

-        "frameworks/native/include/media/openmax",

+        "frameworks/native/headers/media_plugin/media/openmax",

         "system/media/camera/include",

     ],

FAILED: out/soong/build.ninja

out/soong/.bootstrap/bin/soong_build  -t -b out/soong -d out/soong/build.ninja.d -o out/soong/build.ninja Android.bp

error: frameworks/wilhelm/src/Android.bp:237:1: module "libOpenSLES" variant "android_arm64_armv8-a_cortex-a53_shared_core": source path frameworks/native/include/media/openmax does not exist

error: frameworks/wilhelm/src/Android.bp:266:1: module "libOpenMAXAL" variant "android_arm64_armv8-a_cortex-a53_shared_core": source path frameworks/native/include/media/openmax does not exist

ninja: build stopped: subcommand failed.

[Xin Li]

Hi all,

Android 8.1.0 Oreo MR1 source code is now available.  The following builds, tags, and devices are supported:

 - OPM2.171019.012, android-8.1.0_r2, Pixel 2 XL (taimen), Pixel 2 (walleye)

The corresponding factory images, ota images, and proprietary binaries are available at

   https://developers.google.com/android/images

   https://developers.google.com/android/ota

   https://developers.google.com/android/drivers

We have also pushed the corresponding kernel projects for the following devices:

tag                | project      | branch                                | device

android-8.1.0_r0.7 | kernel/msm   | android-msm-wahoo-4.4-oreo-m2         | Pixel 2 and Pixel 2 XL

android-8.1.0_r0.8 | kernel/arm64 | android-easel-intel-linux-4.7-oreo-m2 | Pixel 2 and Pixel 2 XL

[Xin Li]

Hi all,

Android 8.1.0 Oreo MR1 source code is now available.  The following builds, tags, and devices are supported:

 - OPM1.171019.012, android-8.1.0_r3, Pixel XL (marlin), Pixel (sailfish)

 - OPM1.171019.013, android-8.1.0_r4, Pixel 2 XL (taimen), Pixel 2 (walleye)

 - OPM1.171019.014, android-8.1.0_r5, Pixel 2 XL (taimen), Pixel 2 (walleye), Pixel XL (marlin), Pixel (sailfish)

 - OPM1.171019.015, android-8.1.0_r6, Pixel C (dragon)

 - OPM3.171019.013, android-8.1.0_r7, Nexus 5X (bullhead), Nexus 6P (angler)

The corresponding factory images, ota images, and proprietary binaries are available at

   https://developers.google.com/android/images

   https://developers.google.com/android/ota

   https://developers.google.com/android/drivers

We have also pushed the corresponding kernel projects for the following devices:

Tag                 | Project      | Branch                                 | Device

android-8.1.0_r0.9  | kernel/msm   | android-msm-marlin-3.18-oreo-mr1       | Pixel and Pixel XL OPM1.171019.012

android-8.1.0_r0.10 | kernel/msm   | android-msm-wahoo-4.4-oreo-mr1         | Pixel 2 and Pixel 2 XL OPM1.171019.013

android-8.1.0_r0.11 | kernel/arm64 | android-easel-intel-linux-4.7-oreo-mr1 | Pixel 2 and Pixel 2 XL OPM1.171019.013

android-8.1.0_r0.12 | kernel/msm   | android-msm-marlin-3.18-oreo-mr1       | Pixel and Pixel XL OPM1.171019.014

android-8.1.0_r0.13 | kernel/msm   | android-msm-wahoo-4.4-oreo-mr1         | Pixel 2 and Pixel 2 XL OPM1.171019.014

android-8.1.0_r0.14 | kernel/arm64 | android-easel-intel-linux-4.7-oreo-mr1 | Pixel 2 and Pixel 2 XL OPM1.171019.014

android-8.1.0_r0.15 | kernel/tegra | android-tegra-dragon-3.18-oreo-mr1     | Pixel C OPM1.171019.015

android-8.1.0_r0.16 | kernel/msm   | android-msm-angler-3.10-oreo-m3        | Nexus 6P OPM3.171019.013

android-8.1.0_r0.27 | kernel/msm   | android-msm-bullhead-3.10-oreo-m3      | Nexus 5X OPM3.171019.013

[Jone kid]

hi,

where can I find how to config android Oreo  go version  device config  ,for example I  want to run android  go version os ,not android 8.1

Thanks

[Chih-Wei Huang]

Xin Li於 2018年1月3日星期三 UTC+8上午10時15分54秒寫道：

Hi all,

Android 8.1.0 Oreo MR1 source code is now available.  The following builds, tags, and devices are supported:

 - OPM1.171019.012, android-8.1.0_r3, Pixel XL (marlin), Pixel (sailfish)

 - OPM1.171019.013, android-8.1.0_r4, Pixel 2 XL (taimen), Pixel 2 (walleye)

 - OPM1.171019.014, android-8.1.0_r5, Pixel 2 XL (taimen), Pixel 2 (walleye), Pixel XL (marlin), Pixel (sailfish)

 - OPM1.171019.015, android-8.1.0_r6, Pixel C (dragon)

 - OPM3.171019.013, android-8.1.0_r7, Nexus 5X (bullhead), Nexus 6P (angler)

OOPS!
I just praised you released ONE branch for all your devices in 8.1.
But now you broke it again. What happened?

If you can't build all your devices images from one branch,
that means your Treble Project would finally failed.
The Treble Project requires all compatible devices could be updated the Android OS framework only.
That implies one OS framework image (built from one branch of course) could be used for all Treble compatible devices.
So if even Google can't build one image (from one branch) for all of your devices,
how could you expect Treble Project to work?

[Glenn Kasten]

Thank you for your criticism. I'm looking for someone from Treble team to respond,

however it may be a few days due to the holidays.

[Simao Gomes Viana]

I think the main difference between those tags is the base framework.

For example, the Pixel 2 ones have the power menu you see on the Pixel 2 stock images, the other ones have the traditional power menu like on Nougat.

So it's rather a feature-wise thing than a hardware-wise thing, but correct me if I am wrong.

I am running android-8.1.0_r5 on a OnePlus 5 at the moment and it works well, and has the Pixel 2 power menu and some other additional features that Pixel 2 has.

[Xin Li]

The kernel tag for Nexus 5X, build OPM3.171019.013 should read "android-8.1.0_r0.17".

[Chih-Wei Huang]

Simao Gomes Viana於 2018年1月7日星期日 UTC+8上午9時06分40秒寫道：

I think the main difference between those tags is the base framework.

For example, the Pixel 2 ones have the power menu you see on the Pixel 2 stock images, the other ones have the traditional power menu like on Nougat

I don't think that's a good reason.

One release should have a fixed features set.

(of course features could be configured at build time or runtime, but all should be in one codebase)

Otherwise, how could you describe the features of one release?

How could you explain different user experiences to people even they use the same Android version?

"This is the Oreo-MR1 release, but there are two variants of this release, Pixel 2-like and non-Pixel 2 like, ..."

Did Google say so to the vendors?

No, I never heard.

It's ridiculous if Google does so.

Actually fragmentation is a long-standing issue of Android.

Google has spent a lot of effort to improve it -- Treble project is one of the effort.

I can't believe Google will release several Android variants that makes fragmentation much worse.

Refer: https://www.pastemagazine.com/articles/2017/05/can-google-solve-android-fragmentation-for-good.html

I am running android-8.1.0_r5 on a OnePlus 5 at the moment and it works well, and has the Pixel 2 power menu and some other additional features that Pixel 2 has.

About the new power menu, it's already in android-8.1.0_r1.
All image built since android-8.1.0_r1 should have the new power menu.
I don't believe it's a Pixel 2 only feature.

[Xin Li]

Hi all,

Android 8.1.0 Oreo MR1 source code is now available.  The following builds, tags, and devices are supported:

 - OPM2.171019.016, android-8.1.0_r8, Pixel 2 (walleye)

 - OPM5.171019.014, android-8.1.0_r9, Nexus 5X (bullhead), Nexus 6P (angler)

The corresponding factory images, ota images, and proprietary binaries are available at

   https://developers.google.com/android/images

   https://developers.google.com/android/ota

   https://developers.google.com/android/drivers

We have also pushed the corresponding kernel projects for the following devices:

Tag                 | Project      | Branch                                 | Device

android-8.1.0_r0.18 | kernel/msm   | android-msm-wahoo-4.4-oreo-mr1         | Pixel 2 and Pixel 2 XL OPM2.171019.016

android-8.1.0_r0.19 | kernel/arm64 | android-easel-intel-linux-4.7-oreo-mr1 | Pixel 2 and Pixel 2 XL OPM2.171019.016

android-8.1.0_r0.20 | kernel/msm   | android-msm-angler-3.10-oreo-m3        | Nexus 6P OPM5.171019.014

android-8.1.0_r0.21 | kernel/msm   | android-msm-bullhead-3.10-oreo-m3      | Nexus 5X OPM5.171019.014

[薛秋实]

Dear Xin

I built kernel of pixel2 followed https://source.android.com/setup/building-kernels?hl=eng which I used to built pixel success, but the touch screen is not working.

I use below config:

export ARCH=arm64
export CROSS_COMPILE=aarch64-linux-android-
make wahoo_defconfig
make

I tried 2 branches, both has this issue:
aosp:android-8.1.0_r4 kernel:android-msm-wahoo-4.4-oreo-mr1
aosp:android-8.0.0_r21 kernel:android-msm-wahoo-4.4-oreo-dr1

Could you please show me some more instructions?

I found another one also has this issue with pixel2 XL:https://groups.google.com/forum/?hl=zh-Cn#!searchin/android-building/wahoo|sort:date/android-building/3Mycn_LkseQ/NjopgimeBgAJ

[Bill Yi]

Android 8.1.0 Oreo MR1 source code is now available. The following builds, tags, and devices are supported:

 - OPM1.171019.016, android-8.1.0_r10, Pixel XL (marlin), Pixel (sailfish), Pixel C

 - OPM1.171019.018, android-8.1.0_r11, Pixel 2 XL (taimen)

 - OPM1.171019.019, android-8.1.0_r12, Pixel 2 (walleye)

 - OPM3.171019.014, android-8.1.0_r13, Nexus 5X (bullhead), Nexus 6P (angler)

 - OPM5.171019.015, android-8.1.0_r14, Nexus 5X (bullhead), Nexus 6P (angler)

The corresponding factory images, ota images, and proprietary binaries are available at

   https://developers.google.com/android/images

   https://developers.google.com/android/ota

   https://developers.google.com/android/drivers

We have also pushed the corresponding kernel projects for the following devices:

Tag                 | Project      | Branch                                 | Device

android-8.1.0_r0.22 | kernel/msm   | android-msm-bullhead-3.10-oreo-m3      | Nexus 5X 

android-8.1.0_r0.23 | kernel/tegra | android-tegra-dragon-3.18-oreo-mr1     | Pixel C 

android-8.1.0_r0.24 | kernel/msm   | android-msm-marlin-3.18-oreo-mr1       | Pixel and Pixel XL

android-8.1.0_r0.25 | kernel/msm   | android-msm-wahoo-4.4-oreo-mr1         | Pixel 2 and Pixel 2 XL

android-8.1.0_r0.26 | kernel/arm64 | android-easel-intel-linux-4.7-oreo-mr1 | Pixel 2 and Pixel 2 XL 

android-8.1.0_r0.27 | kernel/msm   | android-msm-angler-3.10-oreo-m3        | Nexus 6P

bill

[Xin Li]

Android 8.1.0 Oreo MR1 source code is now available. The following builds, tags, and devices are supported:

 - OPM1.171019.021, android-8.1.0_r15, Pixel XL (marlin), Pixel (sailfish), Pixel 2 XL (taimen), Pixel 2 (walleye)

 - OPM3.171019.016, android-8.1.0_r17, Nexus 6P (angler), Nexus 5X (bullhead)

 - OPM5.171019.017, android-8.1.0_r18, Nexus 6P (angler), Nexus 5X (bullhead)

The corresponding factory images, ota images, and proprietary binaries are available at

   https://developers.google.com/android/images

   https://developers.google.com/android/ota

   https://developers.google.com/android/drivers

We have also pushed the corresponding kernel projects for the following devices:

Tag                 | Project      | Branch                                 | Device

android-8.1.0_r0.30 | kernel/msm   | android-msm-marlin-3.18-oreo-mr1       | Pixel and Pixel XL OPM1.171019.021

android-8.1.0_r0.31 | kernel/msm   | android-msm-wahoo-4.4-oreo-mr1         | Pixel 2 and Pixel 2 XL OPM1.171019.021

android-8.1.0_r0.32 | kernel/arm64 | android-easel-intel-linux-4.7-oreo-mr1 | Pixel 2 and Pixel 2 XL OPM1.171019.021

android-8.1.0_r0.34 | kernel/msm   | android-msm-angler-3.10-oreo-m3        | Nexus 6P OPM3.171019.016

android-8.1.0_r0.35 | kernel/msm   | android-msm-bullhead-3.10-oreo-m3      | Nexus 5X OPM3.171019.016

android-8.1.0_r0.36 | kernel/msm   | android-msm-angler-3.10-oreo-m5        | Nexus 6P OPM5.171019.017

android-8.1.0_r0.37 | kernel/msm   | android-msm-bullhead-3.10-oreo-m5      | Nexus 5X OPM5.171019.017

[Xin Li]

Android 8.1.0 Oreo MR1 source code is now available. The following builds, tags, and devices are supported:

 - OPM1.171019.022.A1, android-8.1.0_r16, Pixel C

The corresponding factory images, ota images, and proprietary binaries are available at

   https://developers.google.com/android/images

   https://developers.google.com/android/ota

   https://developers.google.com/android/drivers

We have also pushed the corresponding kernel projects for the following devices:

Tag                 | Project      | Branch                                 | Device

android-8.1.0_r0.33 | kernel/tegra | android-tegra-dragon-3.18-oreo-mr1-s1  | Pixel C OPM1.171019.022.A1

[Lorant Polya]

Hey, I'm having the same problem.  Have you found a solution?

[Lorant Polya]

Hello,
I'm having the same issue as reported by薛秋实.  Is there a solution to the problem at this point?  I asked this question earlier but it got rejected by a moderator for the reason being that it wasn't relevant.  Would you kindly help me understand why?
Thank you,
Lorant

[David Wu]

Dear Xin,

I have confused by branch naming in https://android.googlesource.com, 

1. Could you please help to explain purpose of different branchs, such as:

oreo-drx-release //x is 1,2,3...

oreo-mx-release //x is 1,2,3...

oreo-mrx-release //x is 1,2,3...

oreo-release

2. Which branch was the tag android-8.1.0_r18 created from?

3. Our company is ready to develop android O Car Project, and we want to update AOSP source code regularly. Which branch is the best choice act as our baseline, oreo-mr1-release or android-8.1.0_r18?

Thanks very much!

On Wednesday, December 6, 2017 at 1:28:30 PM UTC+8, Xin Li wrote:

[Bill Yi]

On Wednesday, March 21, 2018 at 7:05:14 AM UTC-7, David Wu wrote:

Dear Xin,

I have confused by branch naming in https://android.googlesource.com, 

1. Could you please help to explain purpose of different branchs, such as:

You can find the source code tags and builds info here:

https://source.android.com/setup/build-numbers

oreo-drx-release //x is 1,2,3...

The oreo-drx-release (8.0.0) was for the 2017 Pixel 2 devices after the oreo-release. For example:

OPD1.170816.010 android-8.0.0_r21 Oreo Pixel 2 XL, Pixel 2

oreo-mx-release //x is 1,2,3...

The oreo maintenance release (8.1.0) for certain carriers. For example:

OPM5.171019.017 android-8.1.0_r18 Oreo Nexus 5X, Nexus 6P

oreo-mrx-release //x is 1,2,3...

The oreo maintenance release (8.1.0). For example:

OPM1.171019.021 android-8.1.0_r15 Oreo Pixel 2 XL, Pixel 2, Pixel XL, Pixel

oreo-release

 The oreo release (8.0.0). For example:

OPR1.170623.026 android-8.0.0_r7 Oreo Pixel XL, Pixel, Pixel C

 

2. Which branch was the tag android-8.1.0_r18 created from?

The branch is oreo-m5-release. You may find the branch info from the tag on the platform/build project. For example:

https://android.googlesource.com/platform/build/+log/01e2e4beeb304532351212470d75d1ce30c02a13

01e2e4b Version bump to OPM5.171019.017 by android-build-team Robot · 8 weeks ago oreo-m5-release android-8.1.0_r18

3. Our company is ready to develop android O Car Project, and we want to update AOSP source code regularly. Which branch is the best choice act as our baseline, oreo-mr1-release or android-8.1.0_r18?

I suggest "oreo-mr1-release". The latest build for this branch is:

 OPM1.171019.021 android-8.1.0_r15 Oreo Pixel 2 XL, Pixel 2, Pixel XL, Pixel

Hope it helps.

bill

[Bill Yi]

Android 8.1.0 Oreo MR1 source code is now available. The following builds, tags, and devices are supported:

 - OPM1.171019.026, android-8.1.0_r19, Pixel C

 - OPM2.171019.029, android-8.1.0_r20, Pixel 2 XL (taimen), Pixel 2 (walleye), ixel XL (marlin), Pixel (sailfish), Nexus 5X (bullhead)

 - OPM3.171019.019, android-8.1.0_r21, Nexus 6P (angler)

 - OPM5.171019.019, android-8.1.0_r22, Nexus 6P (angler)

The corresponding factory images, ota images, and proprietary binaries are available at

   https://developers.google.com/android/images

   https://developers.google.com/android/ota

   https://developers.google.com/android/drivers

We have also pushed the corresponding kernel projects for the following devices:

Tag                 | Project      | Branch                                 | Device

android-8.1.0_r0.41 | kernel/msm   | android-msm-angler-3.10-oreo-m3        | Nexus 6P

android-8.1.0_r0.42 | kernel/msm   | android-msm-bullhead-3.10-oreo-m2      | Nexus 5X 

android-8.1.0_r0.43 | kernel/tegra | android-tegra-dragon-3.18-oreo-mr1     | Pixel C 

android-8.1.0_r0.44 | kernel/msm   | android-msm-marlin-3.18-oreo-m2        | Pixel and Pixel XL

android-8.1.0_r0.46 | kernel/msm   | android-msm-wahoo-4.4-oreo-m2          | Pixel 2 and Pixel 2 XL

bill

[Bill Yi]

Android 8.1.0 Oreo MR1 source code is now available. The following builds, tags, and devices are supported:

 - OPM4.171019.015.A1, android-8.1.0_r23, Pixel 2 XL (taimen), Pixel 2 (walleye)

The corresponding factory images, ota images, and proprietary binaries are available at

   https://developers.google.com/android/images

   https://developers.google.com/android/ota

   https://developers.google.com/android/drivers

bill

[Xin Li]

Hi all,

Android 8.1.0 Oreo MR1 source code is now available.  The following builds, tags, and devices are supported:

 - OPM2.171019.029.B1, android-8.1.0_r26, Pixel 2 XL (taimen), Pixel 2 (walleye)

 - OPM4.171019.016.A1, android-8.1.0_r27, Nexus 5X

 - OPM4.171019.016.B1, android-8.1.0_r28, Pixel XL (marlin), Pixel (sailfish), Pixel 2 XL (taimen), Pixel 2 (walleye)

 - OPM4.171019.016.C1, android-8.1.0_r29, Pixel C (dragon)

The corresponding factory images, ota images, and proprietary binaries are available at

   https://developers.google.com/android/images

   https://developers.google.com/android/ota

   https://developers.google.com/android/drivers

We have also pushed the corresponding kernel projects for the following devices:

Tag                 | Project      | Branch                                | Device

android-8.1.0_r0.51 | kernel/msm   | android-msm-wahoo-4.4-oreo-m2         | Pixel 2 and Pixel 2 XL OPM2.171019.029.B1

android-8.1.0_r0.52 | kernel/arm64 | android-easel-intel-linux-4.7-oreo-m2 | Pixel 2 and Pixel 2 XL OPM2.171019.029.B1

android-8.1.0_r0.53 | kernel/msm   | android-msm-bullhead-3.10-oreo-m4     | Nexus 5X OPM4.171019.016.A1

android-8.1.0_r0.54 | kernel/msm   | android-msm-marlin-3.18-oreo-m4       | Pixel and Pixel XL OPM4.171019.016.B1

android-8.1.0_r0.55 | kernel/msm   | android-msm-wahoo-4.4-oreo-m4         | Pixel 2 and Pixel 2 XL OPM4.171019.016.B1

android-8.1.0_r0.56 | kernel/arm64 | android-easel-intel-linux-4.7-oreo-m4 | Pixel 2 and Pixel 2 XL OPM4.171019.016.B1

android-8.1.0_r0.57 | kernel/tegra | android-tegra-dragon-3.18-oreo-m4     | Pixel C OPM4.171019.016.C1

[Chih-Wei Huang]

Where is the update of Nexus 6P (angler)?

Xin Li於 2018年5月8日星期二 UTC+8上午7時11分39秒寫道：

[Xin Li]

It would be released really soon.

[Xin Li]

Hi all,

Android 8.1.0 Oreo MR1 source code is now available.  The following build, tag, and device is supported:

 - OPM2.171019.029.A1, android-8.1.0_r25, Nexus 6P (angler)

The corresponding factory images, ota images, and proprietary binaries are available at

   https://developers.google.com/android/images

   https://developers.google.com/android/ota

   https://developers.google.com/android/drivers

We have also pushed the corresponding kernel projects for the following device:

Tag                 | Project    | Branch                          | Device

android-8.1.0_r0.50 | kernel/msm | android-msm-angler-3.10-oreo-m2 | Nexus 6P (OPM2.171019.029.A1)

[Chih-Wei Huang]

Thank you for the update.

However, I always feel uneasy why the updated tag is not a fast-forward commit of previous release.
Worse, usually there are explicitly conflicts between them.

For example, in frameworks/av, merging android-8.1.0_r22 to android-8.1.0_r25 (or r29)
results in the conflicts:

git merge android-8.1.0_r25
Auto-merging media/libmediaplayerservice/include/MediaPlayerInterface.h
CONFLICT (content): Merge conflict in media/libmediaplayerservice/include/MediaPlayerInterface.h
Auto-merging media/libmediaplayerservice/MediaPlayerService.h
CONFLICT (content): Merge conflict in media/libmediaplayerservice/MediaPlayerService.h
Auto-merging media/libmediaplayerservice/MediaPlayerService.cpp
CONFLICT (content): Merge conflict in media/libmediaplayerservice/MediaPlayerService.cpp
Auto-merging media/libmediaplayerservice/MediaPlayerFactory.h
CONFLICT (content): Merge conflict in media/libmediaplayerservice/MediaPlayerFactory.h
Auto-merging media/libmediaplayerservice/MediaPlayerFactory.cpp
CONFLICT (content): Merge conflict in media/libmediaplayerservice/MediaPlayerFactory.cpp
Recorded preimage for 'media/libmediaplayerservice/MediaPlayerFactory.cpp'
Recorded preimage for 'media/libmediaplayerservice/MediaPlayerFactory.h'
Recorded preimage for 'media/libmediaplayerservice/MediaPlayerService.cpp'
Recorded preimage for 'media/libmediaplayerservice/MediaPlayerService.h'
Recorded preimage for 'media/libmediaplayerservice/include/MediaPlayerInterface.h'
Automatic merge failed; fix conflicts and then commit the result.

After checking the git history, I was surprised to find the conflicts result from the two commits:

commit 8a54af87b632c03ff2ae15a4a08880
1bb39fdae7
Author: Pawin Vongmasa
Date: Sun Dec 17 02:31:18 2017 -0800

Refactor MediaPlayerBase's notify

and

commit 5ffa7ea0dfa9ba3eba8ded0878c5293dc35e74a9
Author: Pawin Vongmasa
Date: Tue Dec 12 01:56:40 2017 -0800

Prevent MediaPlayerService::Client's use-after-free

More precisely, android-8.1.0_r22 contains the patch
"Refactor MediaPlayerBase's notify" but android-8.1.0_r29 doesn't.

Digging deeper, I found git log of android-8.1.0_r29
still contains "Refactor MediaPlayerBase's notify"
(commit d12c3600c8), but it was silently removed by
commit dd6cda64 (Snap for 4657601 from 18cd9b58775e53b2ec1ffe571d165ad8fddfeff4 to oc-m4-release).

This doesn't look right to me.
If "Refactor MediaPlayerBase's notify" is unnecessary, shouldn't it be reverted explicitly?

Could anyone explain what happened?

Xin Li於 2018年5月15日星期二 UTC+8上午4時58分39秒寫道：

[Xin Li]

On Fri, May 25, 2018 at 7:49 AM Chih-Wei Huang <cwh...@android-x86.org> wrote:

Thank you for the update.

However, I always feel uneasy why the updated tag is not a fast-forward commit of previous release.
Worse, usually there are explicitly conflicts between them.

For example, in frameworks/av, merging

​​

android-8.1.0_r22 to

​​

android-8.1.0_r25 (or r29)
results in the conflicts:

These tags were from different branches, see https://source.android.com/setup/start/build-numbers for additional information.  You should use tag for the build of the same branch that corresponds to the desired security level; if it's not possible (e.g. branch was switched for the device, etc.), it's usually easier to cherry-pick your local modifications over the latest tag.

Cheers,

[Chih-Wei Huang]

Xin Li於 2018年5月26日星期六 UTC+8上午3時01分55秒寫道：

I understand the methodology, of course.

But that means to rebase our modifications to a new branch.

I have to force push a published branch and people co-work with us have to force update their branch

It may result in more conflicts. That's really annoying. I try to avoid that.

Indeed I didn't see any open source project use such a complex branches scheme like AOSP.

For example, kernel 4.x is always a fast-forward of 4.y if x > y.

Every open source project follows this rule except AOSP (or do you have another counter-example?)

Even you can't make all your devices to use the same branch (I asked why before but no answer),

why can't you use the same branch for the same device?

For example, all the tags android-8.1.0_r21, android-8.1.0_r22, android-8.1.0_r25 should be on the same branch

because they are all belongs to Nexus 6P.

Take a step back, even android-8.1.0_r22 and android-8.1.0_r25 are not on the same branch,

there should be any conflict to merge them. The reason is the same.

Return to the conflict issue I mentioned.

I've talked to Pawin Vongmasa, the author of the conflicted commits.

He said the commit "Refactor MediaPlayerBase's notify" should be present.

He was also surprised by this.

Even this commit should be removed for any reason,

it should be reverted explicitly by a "git revert" command

instead of such a vague commit message like "Snap for 4657601 from ...".

I believe there are some mistakes. I hope someone could review AOSP's complex merging process and simplify it.

[Bill Yi]

Android 8.1.0 Oreo MR1 source code is now available. The following builds, tags, and devices are supported:

 - OPM2.171026.006.C1, android-8.1.0_r30, Pixel 2 XL (taimen), Pixel 2 (walleye)

 - OPM4.171019.021.D1, android-8.1.0_r31, Pixel XL (marlin), Pixel (sailfish), Pixel C (ryu)

 - OPM4.171019.021.E1, android-8.1.0_r32, Pixel 2 XL (taimen), Pixel 2 (walleye)

 - OPM6.171019.030.B1, android-8.1.0_r33, Nexus 6P (angler), Nexus 5x (bullhead)

The corresponding factory images, ota images, and proprietary binaries are available at

   https://developers.google.com/android/images

   https://developers.google.com/android/ota

   https://developers.google.com/android/drivers

We have also pushed the corresponding kernel projects for the following devices:

Tag                 | Project      | Branch                                 | Device

android-8.1.0_r0.61 | kernel/msm   | android-msm-angler-3.10-oreo-m6        | Nexus 6P

android-8.1.0_r0.62 | kernel/msm   | android-msm-bullhead-3.10-oreo-m6      | Nexus 5X 

android-8.1.0_r0.63 | kernel/tegra | android-tegra-dragon-3.18-oreo-m4      | Pixel C 

android-8.1.0_r0.64 | kernel/msm   | android-msm-marlin-3.18-oreo-m4        | Pixel and Pixel XL

android-8.1.0_r0.65 | kernel/msm   | android-msm-wahoo-4.4-oreo-m2          | Pixel 2 and Pixel 2 XL

bill

[Xin Li]

Android 8.1.0 Oreo MR1 source code is now available. The following builds, tags, and devices are supported:

 - OPM2.171026.006.G1, android-8.1.0_r35, Pixel 2

 - OPM2.171026.006.H1, android-8.1.0_r36, Pixel 2 XL

 - OPM4.171019.021.N1, android-8.1.0_r37, Pixel C

 - OPM4.171019.021.P1, android-8.1.0_r38, Pixel, Pixel XL

 - OPM4.171019.021.Q1, android-8.1.0_r39, Pixel 2

 - OPM4.171019.021.R1, android-8.1.0_r40, Pixel 2 XL

 - OPM6.171019.030.E1, android-8.1.0_r41, Nexus 6P and Nexus 5X

The corresponding factory images, ota images, and proprietary binaries are available at

   https://developers.google.com/android/images

   https://developers.google.com/android/ota

   https://developers.google.com/android/drivers

We have also pushed the corresponding kernel projects for the following devices:

Tag                 | Project      | Branch                                | Device

android-8.1.0_r0.70 | kernel/msm   | android-msm-wahoo-4.4-oreo-m2         | Pixel 2

android-8.1.0_r0.71 | kernel/arm64 | android-easel-intel-linux-4.7-oreo-m2 | Pixel 2

android-8.1.0_r0.72 | kernel/msm   | android-msm-wahoo-2018.07-oreo-m2     | Pixel 2 XL

android-8.1.0_r0.73 | kernel/arm64 | android-easel-intel-linux-4.7-oreo-m2 | Pixel 2 XL

android-8.1.0_r0.74 | kernel/tegra | android-tegra-dragon-3.18-oreo-m4     | Pixel C

android-8.1.0_r0.75 | kernel/msm   | android-msm-marlin-3.18-oreo-m4       | Pixel, Pixel XL

android-8.1.0_r0.76 | kernel/msm   | android-msm-wahoo-4.4-oreo-m4         | Pixel 2

android-8.1.0_r0.77 | kernel/arm64 | android-easel-intel-linux-4.7-oreo-m4 | Pixel 2

android-8.1.0_r0.78 | kernel/msm   | android-msm-wahoo-2018.07-oreo-m4     | Pixel 2 XL

android-8.1.0_r0.79 | kernel/arm64 | android-easel-intel-linux-4.7-oreo-m4 | Pixel 2 XL

android-8.1.0_r0.80 | kernel/msm   | android-msm-angler-3.10-oreo-m6       | Nexus 6P

android-8.1.0_r0.81 | kernel/msm   | android-msm-bullhead-3.10-oreo-m6     | Nexus 5X

[vishalm]

Hi Xin Li,

Why are there no updates to oreo-mr1-release branch?

New tags for MR1 are coming up quite often, but this branch is not getting any update.

Regards,

Vishal

[Xin Li]

On Thu, Jul 19, 2018 at 3:22 PM vishalm <vishal....@gmail.com> wrote:

Hi Xin Li,

Why are there no updates to oreo-mr1-release branch?

New tags for MR1 are coming up quite often, but this branch is not getting any update.

There are multiple release branches; oreo-mr1-release is only updated when there is "OPM1" prefixed, non-hotfix builds is published.

For full details about the build IDs, please refer to https://source.android.com/setup/start/build-numbers#platform-code-names-versions-api-levels-and-ndk-releases .

Cheers,

 

--
--
You received this message because you are subscribed to the "Android Building" mailing list.
To post to this group, send email to android-...@googlegroups.com
To unsubscribe from this group, send email to
android-buildi...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/android-building?hl=en

---
You received this message because you are subscribed to the Google Groups "Android Building" group.
To unsubscribe from this group and stop receiving emails from it, send an email to android-buildi...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[vishalm]

Thanks Xin Li,

For AOSP users who are using it for platforms other than pixel devices, is it OK to be on mr1-release branch?

Would we miss anything by not being on the hotfix branches.

[Xin Li]

On Fri, Jul 20, 2018 at 8:00 AM vishalm <vishal....@gmail.com> wrote:

Thanks Xin Li,

For AOSP users who are using it for platforms other than pixel devices, is it OK to be on mr1-release branch?

Would we miss anything by not being on the hotfix branches.

Depends on your goal, if you need the latest security fixes then it's not OK.

​Cheers,​

[vishalm]

Goal is to be on the latest of given Android version (in this case Oreo MR1) in incremental order. 

Wouldn't following security bulletin take care of security fixes?

[Xin Li]

On Fri, Jul 20, 2018 at 2:47 PM vishalm <vishal....@gmail.com> wrote:

Goal is to be on the latest of given Android version (in this case Oreo MR1) in incremental order. 

Wouldn't following security bulletin take care of security fixes?

Oh, yes, following security bulletin would take care for security fixes.

 

[Bill Yi]

Android 8.1.0 Oreo MR1 source code is now available. The following builds, tags, and devices are supported:

 - OPM4.171019.021.Y1, android-8.1.0_r42, Pixel C (dragon)

 - OPM6.171019.030.H1, android-8.1.0_r43, Nexus 6P (angler), Nexus 5x (bullhead)

The corresponding factory images, ota images, and proprietary binaries are available at

   https://developers.google.com/android/images

   https://developers.google.com/android/ota

   https://developers.google.com/android/drivers

We have also pushed the corresponding kernel projects for the following devices:

Tag                 | Project      | Branch                                 | Device

android-8.1.0_r0.91 | kernel/msm   | android-msm-angler-3.10-oreo-m6        | Nexus 6P

android-8.1.0_r0.92 | kernel/msm   | android-msm-bullhead-3.10-oreo-m6      | Nexus 5X 

android-8.1.0_r0.93 | kernel/tegra | android-tegra-dragon-3.18-oreo-m4      | Pixel C

bill

[Xin Li]

Android 8.1.0 Oreo MR1 source code is now available. The following builds, tags, and devices are supported:

 - OPM4.171019.021.Z1, android-8.1.0_r45, Pixel C (dragon)

 - OPM6.171019.030.K1, android-8.1.0_r46, Nexus 6P (angler), Nexus 5x (bullhead)

The corresponding factory images, ota images, and proprietary binaries are available at

   https://developers.google.com/android/images

   https://developers.google.com/android/ota

   https://developers.google.com/android/drivers

We have also pushed the corresponding kernel projects for the following devices:

Tag                  | Project      | Branch                                 | Device

android-8.1.0_r0.100 | kernel/msm   | android-tegra-dragon-3.18-oreo-m4      | Pixel C

android-8.1.0_r0.101 | kernel/msm   | android-msm-angler-3.10-oreo-m6        | Nexus 6P

android-8.1.0_r0.102 | kernel/tegra | android-msm-bullhead-3.10-oreo-m6      | Nexus 5X

[Xin Li]

Correction -- the project for Pixel C should be "kernel/tegra" and project for Nexus 5X should be "kernel/msm".

 

Tag                  | Project      | Branch                                 | Device

android-8.1.0_r0.100 | kernel/tegra | android-tegra-dragon-3.18-oreo-m4      | Pixel C

android-8.1.0_r0.101 | kernel/msm   | android-msm-angler-3.10-oreo-m6        | Nexus 6P

android-8.1.0_r0.102 | kernel/msm   | android-msm-bullhead-3.10-oreo-m6      | Nexus 5X

[Bill Yi]

Android 8.1.0 Oreo MR1 source code is now available. The following builds, tags, and devices are supported:

 - OPM7.181005.003, android-8.1.0_r47, Nexus 6P (angler), Nexus 5x (bullhead)

 - OPM8.181005.003, android-8.1.0_r48, Pixel C (dragon)

The corresponding factory images, ota images, and proprietary binaries are available at

   https://developers.google.com/android/images

   https://developers.google.com/android/ota

   https://developers.google.com/android/drivers

We have also pushed the corresponding kernel projects for the following devices:

Tag                  | Project      | Branch                                 | Device

android-8.1.0_r0.111 | kernel/msm   | android-msm-angler-3.10-oreo-m7        | Nexus 6P

android-8.1.0_r0.112 | kernel/msm   | android-msm-bullhead-3.10-oreo-m7      | Nexus 5X 

android-8.1.0_r0.113 | kernel/tegra | android-tegra-dragon-3.18-oreo-m8      | Pixel C 

bill

[Xin Li]

Android 8.1.0 Oreo MR1 source code is now available. The following builds, tags, and devices are supported:

 - OPM7.181105.004, android-8.1.0_r50, Nexus 6P (angler), Nexus 5x (bullhead)

 - OPM8.181105.002, android-8.1.0_r51, Pixel C (dragon)

The corresponding factory images, ota images, and proprietary binaries are available at

   https://developers.google.com/android/images

   https://developers.google.com/android/ota

   https://developers.google.com/android/drivers

We have also pushed the corresponding kernel projects for the following devices:

Tag                  | Project      | Branch                            | Device

android-8.1.0_r0.115 | kernel/tegra | android-tegra-dragon-3.18-oreo-m8 | Pixel C

android-8.1.0_r0.116 | kernel/msm   | android-msm-angler-3.10-oreo-m7   | Nexus 6P

android-8.1.0_r0.117 | kernel/msm   | android-msm-bullhead-3.10-oreo-m7 | Nexus 5X

[Bill Yi]

Android 8.1.0 Oreo MR1 source code is now available. The following builds, tags, and devices are supported:

 - OPM7.181205.001, android-8.1.0_r52, Nexus 6P (angler), Nexus 5x (bullhead)

 - OPM8.181205.001, android-8.1.0_r53, Pixel C (dragon)

The corresponding factory images, ota images, and proprietary binaries are available at

   https://developers.google.com/android/images

   https://developers.google.com/android/ota

   https://developers.google.com/android/drivers

We have also pushed the corresponding kernel projects for the following devices:

Tag                  | Project      | Branch                                 | Device

android-8.1.0_r0.121 | kernel/msm   | android-msm-angler-3.10-oreo-m7        | Nexus 6P

android-8.1.0_r0.122 | kernel/msm   | android-msm-bullhead-3.10-oreo-m7      | Nexus 5X 

android-8.1.0_r0.123 | kernel/tegra | android-tegra-dragon-3.18-oreo-m8      | Pixel C 

bill

[Xin Li]

Android 8.1.0 Oreo MR1 source code is now available. The following builds, tags, and devices are supported:

 - OPM8.190105.002, android-8.1.0_r60, Pixel C (dragon)

The corresponding factory images, ota images, and proprietary binaries are available at

   https://developers.google.com/android/images

   https://developers.google.com/android/ota

   https://developers.google.com/android/drivers

We have also pushed the corresponding kernel projects for the following devices:

Tag                  | Project      | Branch                            | Device

android-8.1.0_r0.130 | kernel/tegra | android-tegra-dragon-3.18-oreo-m8 | Pixel C 

[Xin Li]

Android 8.1.0 Oreo MR1 source code is now available. The following builds, tags, and devices are supported:

 - OPM8.190205.001, android-8.1.0_r61, Pixel C (dragon)

The corresponding factory images, ota images, and proprietary binaries are available at

   https://developers.google.com/android/images

   https://developers.google.com/android/ota

   https://developers.google.com/android/drivers

We have also pushed the corresponding kernel projects for the following devices:

Tag                  | Project      | Branch                            | Device

android-8.1.0_r0.131 | kernel/tegra | android-tegra-dragon-3.18-oreo-m8 | Pixel C

[Xin Li]

Android 8.1.0 Oreo MR1 source code is now available. The following builds, tags, and devices are supported:

 - OPM8.190305.001, android-8.1.0_r62, Pixel C (dragon)

The corresponding factory images, ota images, and proprietary binaries are available at

   https://developers.google.com/android/images

   https://developers.google.com/android/ota

   https://developers.google.com/android/drivers

We have also pushed the corresponding kernel projects for the following devices:

Tag                  | Project      | Branch                            | Device

android-8.1.0_r0.132 | kernel/tegra | android-tegra-dragon-3.18-oreo-m8 | Pixel C

[Bill Yi]

Android 8.1.0 Oreo MR1 source code is now available. The following builds, tags, and devices are supported:

 - OPM8.190405.001, android-8.1.0_r63, Pixel C (dragon)

The corresponding factory images, ota images, and proprietary binaries are available at

   https://developers.google.com/android/images

   https://developers.google.com/android/ota

   https://developers.google.com/android/drivers

We have also pushed the corresponding kernel projects for the following devices:

Tag                  | Project      | Branch                                 | Device

android-8.1.0_r0.133 | kernel/tegra | android-tegra-dragon-3.18-oreo-m8      | Pixel C 

bill

[Xin Li]

Android 8.1.0 Oreo MR1 source code is now available. The following builds, tags, and devices are supported:

 - OPM8.190505.001, android-8.1.0_r64, Pixel C (dragon)

The corresponding factory images, ota images, and proprietary binaries are available at

   https://developers.google.com/android/images

   https://developers.google.com/android/ota

   https://developers.google.com/android/drivers

We have also pushed the corresponding kernel projects for the following devices:

Tag                  | Project      | Branch                                 | Device

android-8.1.0_r0.134 | kernel/tegra | android-tegra-dragon-3.18-oreo-m8      | Pixel C

[Bill Yi]

Android 8.1.0 Oreo MR1 source code is now available. The following builds, tags, and devices are supported:

 - OPM8.190605.003, android-8.1.0_r65, Pixel C (dragon)

The corresponding factory images, ota images, and proprietary binaries are available at

   https://developers.google.com/android/images

   https://developers.google.com/android/ota

   https://developers.google.com/android/drivers

We have also pushed the corresponding kernel projects for the following devices:

Tag                  | Project      | Branch                                 | Device

android-8.1.0_r0.135 | kernel/tegra | android-tegra-dragon-3.18-oreo-m8      | Pixel C 

bill

[Xin Li]

Android 8.1.0 Oreo MR1 source code is now available on the oreo-mr1-security-release branch.

This release contains all recent Oreo MR1 platform security updates up to August 2019 Security Release corresponding to the following build and tag:

 - 5650812, android-8.1.0_r66

[Xin Li]

Hi, all,

Android 8.1.0 Oreo MR1 source code is now available. The following builds, tags, and devices are supported:

 - OPM8.190605.005, android-8.1.0_r67, Pixel C (dragon)

The corresponding factory images, ota images, and proprietary binaries are available at

   https://developers.google.com/android/images

   https://developers.google.com/android/ota

   https://developers.google.com/android/drivers

The kernel source is identical to OPM8.190605.003 build.

[Xin Li]

Android 8.1.0 Oreo MR1 source code is now available on the oreo-mr1-security-release branch.

This release contains all recent Oreo MR1 platform security updates up to October 2019 Security Release corresponding to the following build and tag:

 - 5794017, android-8.1.0_r69

[Chih-Wei Huang]

Xin Li於 2019年10月8日星期二 UTC+8上午6時56分18秒寫道：

Android 8.1.0 Oreo MR1 source code is now available on the oreo-mr1-security-release branch.

This release contains all recent Oreo MR1 platform security updates up to October 2019 Security Release corresponding to the following build and tag:

 - 5794017, android-8.1.0_r69

The security patch of r65 is 2019-06-05, but r69 is 2017-12-05?

This is a very very confusing thing. Do you really have security updates in r69?

$ git diff android-8.1.0_r65 android-8.1.0_r69 core/version_defaults.mk
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 5f45946d5..5758d2275 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -181,7 +181,7 @@ ifndef PLATFORM_SECURITY_PATCH
     #  It must be of the form "YYYY-MM-DD" on production devices.
     #  It must match one of the Android Security Patch Level strings of the Public Security Bulletins.
     #  If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
-      PLATFORM_SECURITY_PATCH := 2019-06-05
+      PLATFORM_SECURITY_PATCH := 2017-12-05
 endif
 
 ifndef PLATFORM_BASE_OS