Android 11 Beta2 编译报错问题处理

为了尝鲜Get Android 11的系统新特性,决定从Google官网拉套代码自己编译玩玩。

既然是尝鲜,当然要拉Android 11最新分支代码了 – Android 11 Beta2,下面是同步代码的指令:

1
2
repo init -u https://android.googlesource.com/platform/manifest -b android-r-beta-2
repo sync -j4

从device/google目录发现只有cuttlefish项目使用的API是30(对应Android 11),于是用下面的命令开启编译:

1
2
3
source build/envsetup.sh
lunch aosp_cf_arm64_phone
make -j4 2>&1 | tee build.log

然而AOSP代码编译之路一如既往的不顺畅,直至编译完成看到新增的vendor_boot.img,耗时一天,总共遇到29个编译报错。这些问题基本都是因为同一个功能多笔提交没同步merge到beta2分支引起的。

我解决报错问题的步骤大概是:

a. 查看编译报错日志,确认报错非环境问题;

b. 使用”git log –pretty=oneline”指令查看报错文件本地的修改记录;

c. 然后前往 “ https://cs.android.com/android/platform/superproject “ 网站打开master分支,查看报错的文件修改记录(history);

d. 依次点击history中的change-id点击跳转至 “ https://android-review.googlesource.com “ 网站,判断是否因该笔提交未merged到beta2分支导致编译报错;

e. 将该笔提交cherry-pick到本地(同步需要检查”Submitted together”处关联的提交是否有一起同步到本地)。

现将这29个报错的关键log和解决方案的gerrit提交整理如下:

(1) Error 1 – external/linux-kselftest

1
2
error: external/linux-kselftest/Android.bp:53:13: unrecognized property "arch.mips"
error: external/linux-kselftest/Android.bp:56:15: unrecognized property "arch.mips64"

将master分之上”1252987”修改cherry-pick到本地:

1
https://android-review.googlesource.com/c/platform/external/linux-kselftest/+/1252987

(2) Error 2 – external/seccomp-tests

1
2
error: external/seccomp-tests/Android.bp:20:13: unrecognized property "arch.mips"
error: external/seccomp-tests/Android.bp:23:15: unrecognized property "arch.mips64"

将master分之上”1253167”修改cherry-pick到本地:

1
https://android-review.googlesource.com/c/platform/external/seccomp-tests/+/1253167

(3) Error 3 – libcore/apex

1
2
3
4
5
6
7
8
error: libcore/apex/Android.bp:22:1: module "com.android.i18n" already defined
packages/modules/RuntimeI18n/apex/Android.bp:22:1 <-- previous definition here
error: libcore/apex/Android.bp:28:1: module "com.android.i18n-defaults" already defined
packages/modules/RuntimeI18n/apex/Android.bp:28:1 <-- previous definition here
error: libcore/apex/Android.bp:36:1: module "com.android.i18n.key" already defined
packages/modules/RuntimeI18n/apex/Android.bp:47:1 <-- previous definition here
error: libcore/apex/Android.bp:42:1: module "com.android.i18n.certificate" already defined
packages/modules/RuntimeI18n/apex/Android.bp:53:1 <-- previous definition here

将master分之上”1312197”修改cherry-pick到本地:

1
https://android-review.googlesource.com/c/platform/libcore/+/1312197

注:同步检查关联的git仓中提交是否同步到本地:

1
2
https://android-review.googlesource.com/c/platform/external/icu/+/1311823
https://android-review.googlesource.com/c/platform/packages/modules/RuntimeI18n/+/1311889

(4) Error 4 – libcore

1
2
error: libcore/non_openjdk_java_files.bp:444:1: module "timezone_host_files" already defined
external/icu/android_icu4j/Android.bp:55:1 <-- previous definition here

将master分之上”1333998”修改cherry-pick到本地:

1
https://android-review.googlesource.com/c/platform/libcore/+/1333998

注:同步检查关联的git仓中提交是否同步到本地:

1
2
3
4
5
6
https://android-review.googlesource.com/c/platform/cts/+/1345756
https://android-review.googlesource.com/c/platform/external/icu/+/1346402
https://android-review.googlesource.com/c/platform/external/icu/+/1332159
https://android-review.googlesource.com/c/platform/frameworks/base/+/1346485
https://android-review.googlesource.com/c/platform/frameworks/layoutlib/+/1347566
https://android-review.googlesource.com/c/platform/system/timezone/+/1336237

(5) Error 5 – art/build/sdk

1
2
3
error: art/build/sdk/Android.bp:16:1: "art-module-sdk" depends on undefined module "legacy.core.platform.api.stubs"
error: art/build/sdk/Android.bp:16:1: "art-module-sdk" depends on undefined module "legacy-art-module-platform-api-stubs-system-modules"
error: art/build/sdk/Android.bp:16:1: "art-module-sdk" depends on undefined module "legacy-core-platform-api-stubs-system-modules"

将master分之上”1321929”修改cherry-pick到本地:

1
https://android-review.googlesource.com/c/platform/libcore/+/1321929

注:同步检查关联的git仓中提交是否同步到本地:

1
2
3
4
5
https://android-review.googlesource.com/c/platform/art/+/1321930
https://android-review.googlesource.com/c/platform/build/soong/+/1322704
https://android-review.googlesource.com/c/platform/external/conscrypt/+/1322705
https://android-review.googlesource.com/c/platform/external/icu/+/1322167
https://android-review.googlesource.com/c/platform/external/wycheproof/+/1321928

(6) Error 6 – libcore/mmodules/core_platform_api

1
error: libcore/mmodules/core_platform_api/Android.bp:196:1: "stable.core.platform.api.stubs" depends on undefined module "i18n.module.platform.api.stubs"

将master分之上”1325832”修改cherry-pick到本地:

1
https://android-review.googlesource.com/c/platform/libcore/+/1325832

注:同步检查关联的git仓中提交是否同步到本地:

1
https://android-review.googlesource.com/c/platform/external/icu/+/1325831

(7) Error 7 – tools/security/fuzzing/orphans/gptfdisk

1
error: tools/security/fuzzing/orphans/gptfdisk/Android.bp:1:1: "sgdisk_fuzz" depends on undefined module "libgptf"

将master分之上”1319790”修改cherry-pick到本地:

1
https://android-review.googlesource.com/c/platform/external/gptfdisk/+/1319790

(8) Error 8 – external/grpc-grpc-java/auth

1
error: external/grpc-grpc-java/auth/Android.bp:16:1: "grpc-java-auth" depends on undefined module "google-auth-library-credentials-0.13.0"

将master分之上”1344767”和”1344768”修改cherry-pick到本地:

1
2
https://android-review.googlesource.com/c/platform/prebuilts/tools/+/1344767
https://android-review.googlesource.com/c/platform/prebuilts/tools/+/1344768

(9) Error 9 – external/grpc-grpc-java/protobuf

1
error: external/grpc-grpc-java/protobuf/Android.bp:18:1: "grpc-java-protobuf" depends on undefined module "com.google.api.grpc_proto-google-common-protos-prebuilt-jar"

将master分之上”1320776”和”1323020”修改cherry-pick到本地:

1
2
https://android-review.googlesource.com/c/platform/prebuilts/tools/+/1320776
https://android-review.googlesource.com/c/platform/prebuilts/tools/+/1323020

(10) Error 10 – frameworks/base

1
2
3
4
5
error: frameworks/base/StubLibraries.bp:334:1: "android_module_lib_stubs_current" depends on undefined module "art-notices-for-framework-stubs-jar"
error: frameworks/base/StubLibraries.bp:348:1: "android_system_non_updatable_stubs_current" depends on undefined module "art-notices-for-framework-stubs-jar"
error: frameworks/base/StubLibraries.bp:328:1: "android_test_stubs_current" depends on undefined module "art-notices-for-framework-stubs-jar"
error: frameworks/base/StubLibraries.bp:341:1: "android_non_updatable_stubs_current" depends on undefined module "art-notices-for-framework-stubs-jar"
error: frameworks/base/StubLibraries.bp:316:1: "android_stubs_current" depends on undefined module "art-notices-for-framework-stubs-jar"

将master分之上”1268170”修改cherry-pick到本地:

1
https://android-review.googlesource.com/c/platform/libcore/+/1268170

注:同步检查关联的git仓中提交是否同步到本地:

1
https://android-review.googlesource.com/c/platform/frameworks/base/+/1268148

(11) Error 11 – cts/tests/libcore/wycheproof-bc

1
error: cts/tests/libcore/wycheproof-bc/Android.bp:15:1: "CtsLibcoreWycheproofBCTestCases" depends on undefined module "libcore-expectations-knownfailures-jar"

将master分之上”1268162”修改cherry-pick到本地:

1
https://android-review.googlesource.com/c/platform/libcore/+/1268162

注:同步检查关联的git仓中提交是否同步到本地:

1
https://android-review.googlesource.com/c/platform/cts/+/1268124

(12) Error 12 – libcore

1
error: libcore/JavaLibrary.bp:158:1: "core-all" depends on undefined module "i18n-module-intra-core-api-stubs-source"

将master分之上”1321924”修改cherry-pick到本地:

1
https://android-review.googlesource.com/c/platform/libcore/+/1321924

注:同步检查关联的git仓中提交是否同步到本地:

1
https://android-review.googlesource.com/c/platform/external/icu/+/1322166

(13) Error 13 – art/test

1
2
3
error: art/test/094-pattern/Android.bp:2:1: module "art-run-test-094-pattern" variant "android_common": depends on //libcore:core-all-system-modules which is not visible to this module
error: art/test/2031-zygote-compiled-frame-deopt/Android.bp:2:1: module "art-run-test-2031-zygote-compiled-frame-deopt" variant "android_common": depends on //libcore:core-all-system-modules which is not visible to this module
error: art/test/074-gc-thrash/Android.bp:2:1: module "art-run-test-074-gc-thrash" variant "android_common": depends on //libcore:core-all-system-modules which is not visible to this module

将master分之上”1235266”修改cherry-pick到本地:

1
https://android-review.googlesource.com/c/platform/libcore/+/1235266

注:同步检查关联的git仓中提交是否同步到本地:

1
2
https://android-review.googlesource.com/c/platform/art/+/1235248
https://android-review.googlesource.com/c/platform/build/soong/+/1235128

(14) Error 14 – art/build/sdk

1
2
error: art/build/sdk/Android.bp:16:1: module "art-module-sdk" variant "android_common": depends on //libcore:libandroidio which is not visible to this module
error: art/build/sdk/Android.bp:16:1: module "art-module-sdk" variant "android_common": depends on //libcore:libandroidio which is not visible to this module

将master分之上”1258499”修改cherry-pick到本地:

1
https://android-review.googlesource.com/c/platform/libcore/+/1258499

注:同步检查关联的git仓中提交是否同步到本地:

1
2
https://android-review.googlesource.com/c/platform/external/boringssl/+/1258354
https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1258479

(15) Error 15 – libcore

1
error: libcore/NativeCode.bp:207:1: module "libjavacoretests" variant "android_arm_armv8-a_cortex-a53_shared": depends on //libnativehelper:libnativehelper_compat_libc++ which is not visible to this module

将master分之上”1297334”修改cherry-pick到本地:

1
https://android-review.googlesource.com/c/platform/libcore/+/1297334

注:同步检查关联的git仓中提交是否同步到本地:

1
2
3
4
5
6
https://android-review.googlesource.com/c/platform/art/+/1297219
https://android-review.googlesource.com/c/platform/cts/+/1295383
https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1297221
https://android-review.googlesource.com/c/platform/libnativehelper/+/1297222
https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1295657
https://android-review.googlesource.com/c/platform/system/core/+/1298681

(16) Error 16 – libcore

1
error: libcore/NativeCode.bp:48:1: module "libjavacore" variant "android_arm_armv8-a_cortex-a53_shared": depends on //external/icu/libandroidicuinit:libandroidicuinit which is not visible to this module

将master分之上”1250330”和”1254472”修改cherry-pick到本地:

1
2
https://android-review.googlesource.com/c/platform/libcore/+/1250330
https://android-review.googlesource.com/c/platform/libcore/+/1254472

注:同步检查关联的git仓中提交是否同步到本地:

1
2
3
4
5
6
7
8
9
10
https://android-review.googlesource.com/c/platform/external/icu/+/1254607
https://android-review.googlesource.com/c/platform/external/icu/+/1250480
https://android-review.googlesource.com/c/platform/external/robolectric-shadows/+/1254379
https://android-review.googlesource.com/c/platform/external/robolectric-shadows/+/1254366
https://android-review.googlesource.com/c/platform/frameworks/base/+/1254517
https://android-review.googlesource.com/c/platform/frameworks/layoutlib/+/1250546
https://android-review.googlesource.com/c/platform/libcore/+/1254471

https://android-review.googlesource.com/c/platform/art/+/1255567
https://android-review.googlesource.com/c/platform/external/icu/+/1254611

(17) Error 17 – libcore

1
error: libcore/NativeCode.bp:48:1: module "libjavacore" variant "linux_glibc_x86_shared": depends on //external/icu/libandroidicuinit:libandroidicuinit which is not visible to this module

将master分之上”1278614”修改cherry-pick到本地:

1
https://android-review.googlesource.com/c/platform/libcore/+/1278614

注:同步检查关联的git仓中提交是否同步到本地:

1
https://android-review.googlesource.com/c/platform/external/icu/+/1277510

(18) Error 18 – packages/modules/RuntimeI18n/apex

1
2
3
4
5
6
error: packages/modules/RuntimeI18n/apex/Android.bp:22:1: module "com.android.i18n" variant "android_common_cfi_com.android.i18n_image": "com.android.i18n" requires "libpac" that is not available for the APEX. Dependency path:
via tag apex.dependencyTag{name:"sharedLib", payload:true}
-> libpac{os:android,image:,arch:arm64_armv8-a_cortex-a53,sdk:,link:shared,version:,cfi:cfi,apex:com.android.i18n}
error: packages/modules/RuntimeI18n/apex/Android.bp:22:1: module "com.android.i18n" variant "android_common_cfi_com.android.i18n_image": "com.android.i18n" requires "libpac" that is not available for the APEX. Dependency path:
via tag apex.dependencyTag{name:"sharedLib", payload:true}
-> libpac{os:android,image:,arch:arm_armv8-a_cortex-a53,sdk:,link:shared,version:,apex:com.android.i18n}

将master分之上”1283723”修改cherry-pick到本地:

1
https://android-review.googlesource.com/c/platform/external/chromium-libpac/+/1283723

注:同步检查关联的git仓中提交是否同步到本地:

1
2
3
4
5
6
7
8
9
10
https://android-review.googlesource.com/c/platform/art/+/1299494
https://android-review.googlesource.com/c/platform/art/+/1283897
https://android-review.googlesource.com/c/platform/build/+/1284676
https://android-review.googlesource.com/c/platform/external/icu/+/1284675
https://android-review.googlesource.com/c/platform/external/v8/+/1284993
https://android-review.googlesource.com/c/platform/external/vogar/+/1294615
https://android-review.googlesource.com/c/platform/frameworks/base/+/1283938
https://android-review.googlesource.com/c/platform/libcore/+/1283721
https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1288092
https://android-review.googlesource.com/c/platform/system/sepolicy/+/1283724

(19) Error 19 – external/e2fsprogs/contrib/android

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
external/e2fsprogs/contrib/android/perms.c:123:22: error: variable has incomplete type 'struct vfs_cap_data'
struct vfs_cap_data cap_data;
^
external/e2fsprogs/contrib/android/perms.c:123:9: note: forward declaration of 'struct vfs_cap_data'
struct vfs_cap_data cap_data;
^
external/e2fsprogs/contrib/android/perms.c:161:23: error: use of undeclared identifier 'VFS_CAP_REVISION_2'
cap_data.magic_etc = VFS_CAP_REVISION_2 | VFS_CAP_FLAGS_EFFECTIVE;
^
external/e2fsprogs/contrib/android/perms.c:161:44: error: use of undeclared identifier 'VFS_CAP_FLAGS_EFFECTIVE'
cap_data.magic_etc = VFS_CAP_REVISION_2 | VFS_CAP_FLAGS_EFFECTIVE;
^
external/e2fsprogs/contrib/android/perms.c:370:20: error: use of undeclared identifier 'fs_config'
fs_config_func = fs_config;
^
4 errors generated.

将master分之上”1250416”修改cherry-pick到本地:

1
https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/1250416

注:同步检查关联的git仓中提交是否同步到本地:

1
2
3
4
https://android-review.googlesource.com/c/platform/build/+/1250293
https://android-review.googlesource.com/c/platform/system/bpf/+/1250509
https://android-review.googlesource.com/c/platform/system/core/+/1250711
https://android-review.googlesource.com/c/platform/external/squashfs-tools/+/1250437

(20) Error 20 – libcore/luni/src/main/native

1
2
3
4
libcore/luni/src/main/native/JniException.cpp:24:48: error: use of undeclared identifier 'jniStrError'
jniThrowException(env, exceptionClassName, jniStrError(error, buf, sizeof(buf)));
^
1 error generated.

将master分之上”1260462”修改cherry-pick到本地:

1
https://android-review.googlesource.com/c/platform/libcore/+/1260462

注:同步检查关联的git仓中提交是否同步到本地:

1
https://android-review.googlesource.com/c/platform/libnativehelper/+/1260463

(21) Error 21 – libcore/luni/src/main/native

1
2
3
4
libcore/luni/src/main/native/Register.cpp:68:5: error: use of undeclared identifier 'jniUninitializeConstants'
jniUninitializeConstants();
^
1 error generated.

将master分之上”1348842”修改cherry-pick到本地:

1
https://android-review.googlesource.com/c/platform/libcore/+/1348842

注:同步检查关联的git仓中提交是否同步到本地:

1
2
3
4
5
6
7
8
9
https://android-review.googlesource.com/c/platform/cts/+/1348822
https://android-review.googlesource.com/c/platform/frameworks/base/+/1348764
https://android-review.googlesource.com/c/platform/frameworks/base/+/1348763
https://android-review.googlesource.com/c/platform/frameworks/native/+/1348765
https://android-review.googlesource.com/c/platform/libnativehelper/+/1348766
https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1348767
https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/1348862
https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1348843
https://android-review.googlesource.com/c/platform/system/incremental_delivery/+/1348882

(22) Error 22 – libcore/luni/src/main/native

1
2
3
4
libcore/luni/src/main/native/libcore_icu_TimeZoneNames.cpp:28:10: fatal error: 'ScopedIcuLocale.h' file not found
#include "ScopedIcuLocale.h"
^~~~~~~~~~~~~~~~~~~
1 error generated.

将master分之上”1244646”修改cherry-pick到本地:

1
https://android-review.googlesource.com/c/platform/libcore/+/1244646

注:同步检查关联的git仓中提交是否同步到本地:

1
https://android-review.googlesource.com/c/platform/external/icu/+/1244626

(23) Error 23 – libcore/luni/src/main/native

1
2
3
4
5
6
7
8
libcore/luni/src/main/native/libcore_io_Linux.cpp:1115:21: error: use of undeclared identifier 'jniGetOwnerIdFromFileDescriptor'; did you mean 'jniGetFDFromFileDescriptor'?
jlong ownerId = jniGetOwnerIdFromFileDescriptor(env, javaFd);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
jniGetFDFromFileDescriptor
libnativehelper/include_platform/nativehelper/JNIPlatformHelp.h:109:12: note: 'jniGetFDFromFileDescriptor' declared here
inline int jniGetFDFromFileDescriptor(JNIEnv* env, jobject fileDescriptor) {
^
1 error generated.

将master分之上”1280514”修改cherry-pick到本地:

1
https://android-review.googlesource.com/c/platform/libcore/+/1280514

注:同步检查关联的git仓中提交是否同步到本地:

1
2
https://android-review.googlesource.com/c/platform/art/+/1280255
https://android-review.googlesource.com/c/platform/libnativehelper/+/1280454

(24) Error 24 – libcore/mmodules/intracoreapi/api/intra

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
--- libcore/mmodules/intracoreapi/api/intra/current-api.txt	2020-07-25 17:40:20.613208804 +0800
+++ out/soong/.intermediates/libcore/mmodules/intracoreapi/art-module-intra-core-api-stubs-source/android_common/art-module-intra-core-api-stubs-source_api.txt 2020-07-27 12:17:04.074987448 +0800
@@ -75,7 +75,7 @@ @libcore.api.CorePlatformApi @libcore.ap
package java.net {

public class Socket implements java.io.Closeable {
- method public java.io.FileDescriptor getFileDescriptor$();
+ method @libcore.api.IntraCoreApi public java.io.FileDescriptor getFileDescriptor$();
}

}
@@ -87,11 +87,11 @@ public abstract class Charset implements
}

public abstract class CharsetDecoder {
- ctor protected CharsetDecoder(java.nio.charset.Charset, float, float);
+ ctor @libcore.api.IntraCoreApi protected CharsetDecoder(java.nio.charset.Charset, float, float);
}

public abstract class CharsetEncoder {
- ctor protected CharsetEncoder(java.nio.charset.Charset, float, float, byte[], boolean);
+ ctor @libcore.api.IntraCoreApi protected CharsetEncoder(java.nio.charset.Charset, float, float, byte[], boolean);
}

}
@@ -99,8 +99,8 @@ public abstract class CharsetEncoder {
package java.security.spec {

public class ECParameterSpec implements java.security.spec.AlgorithmParameterSpec {
- method public String getCurveName();
- method public void setCurveName(String);
+ method @libcore.api.IntraCoreApi public String getCurveName();
+ method @libcore.api.IntraCoreApi public void setCurveName(String);
}

}
@@ -160,18 +160,18 @@ @java.lang.annotation.Documented @java.l

package sun.security.util {

- public interface DerEncoder {
- method public void derEncode(java.io.OutputStream) throws java.io.IOException;
+ @libcore.api.IntraCoreApi public interface DerEncoder {
+ method @libcore.api.IntraCoreApi public void derEncode(java.io.OutputStream) throws java.io.IOException;
}

}

package sun.security.x509 {

- public class AlgorithmId implements sun.security.util.DerEncoder java.io.Serializable {
- method public void derEncode(java.io.OutputStream) throws java.io.IOException;
- method public static sun.security.x509.AlgorithmId get(String) throws java.security.NoSuchAlgorithmException;
- method public String getName();
+ @libcore.api.IntraCoreApi public class AlgorithmId implements sun.security.util.DerEncoder java.io.Serializable {
+ method @libcore.api.IntraCoreApi public void derEncode(java.io.OutputStream) throws java.io.IOException;
+ method @libcore.api.IntraCoreApi public static sun.security.x509.AlgorithmId get(String) throws java.security.NoSuchAlgorithmException;
+ method @libcore.api.IntraCoreApi public String getName();
}

}

将master分之上”1314542”修改cherry-pick到本地:

1
https://android-review.googlesource.com/c/platform/libcore/+/1314542

注:同步检查关联的git仓中提交是否同步到本地:

1
https://android-review.googlesource.com/c/platform/tools/metalava/+/1314777

(25) Error 25 – libcore/luni/src/main/java/libcore/icu

1
2
3
4
5
6
libcore/luni/src/main/java/libcore/icu/DateUtilsBridge.java:19: error: cannot find symbol
import android.icu.impl.JavaTimeZone;
^
symbol: class JavaTimeZone
location: package android.icu.impl
1 error

将master分之上”1356706”修改cherry-pick到本地:

1
https://android-review.googlesource.com/c/platform/libcore/+/1356706

注:同步检查关联的git仓中提交是否同步到本地:

1
https://android-review.googlesource.com/c/platform/external/icu/+/1356703

(26) Error 26 – libcore/ojluni/src/main/java/java/lang

1
2
3
4
5
6
libcore/ojluni/src/main/java/java/lang/System.java:985: error: cannot find symbol
StructPasswd passwd = Libcore.os.getpwuid(Libcore.os.getuid());
^
symbol: class StructPasswd
location: class System
1 error

将master分之上”1245068”修改cherry-pick到本地:

1
https://android-review.googlesource.com/c/platform/libcore/+/1245068

(27) Error 27 – libcore/mmodules/core_platform_api/api/legacy_platform

1
2
3
4
5
6
7
8
9
10
11
12
13
14
--- libcore/mmodules/core_platform_api/api/legacy_platform/current-api.txt	2020-07-25 17:40:20.617208818 +0800
+++ out/soong/.intermediates/libcore/mmodules/core_platform_api/legacy-art-module-platform-api-stubs-source/android_common/legacy-art-module-platform-api-stubs-source_api.txt 2020-07-27 12:55:45.522215345 +0800
@@ -211,10 +211,6 @@ public class DERBitString extends com.an
ctor public DERBitString(byte[]);
}

- @Deprecated public class DERInteger extends com.android.org.bouncycastle.asn1.ASN1Integer {
- ctor @Deprecated public DERInteger(long);
- }
-
public class DERNull extends com.android.org.bouncycastle.asn1.ASN1Null {
field public static final com.android.org.bouncycastle.asn1.DERNull INSTANCE;
}
-e

将master分之上”1305974”修改cherry-pick到本地:

1
https://android-review.googlesource.com/c/platform/libcore/+/1305974

注:同步检查关联的git仓中提交是否同步到本地:

1
2
https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1305774
https://android-review.googlesource.com/c/platform/frameworks/base/+/1305793

(28) Error 28 – external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/ClientSessionContext.java:31: error: cannot find symbol
@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
^
symbol: method status()
location: @interface CorePlatformApi
external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/ClientSessionContext.java:31: error: cannot find symbol
@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
^
symbol: variable Status
location: @interface CorePlatformApi
external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/SSLClientSessionCache.java:34: error: cannot find symbol
@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
^
symbol: method status()
location: @interface CorePlatformApi
...
116 errors

将master分之上”1333216”修改cherry-pick到本地:

1
https://android-review.googlesource.com/c/platform/libcore/+/1333216

注:同步检查关联的git仓中提交是否同步到本地:

1
2
3
https://android-review.googlesource.com/c/platform/external/conscrypt/+/1331615
https://android-review.googlesource.com/c/platform/external/icu/+/1332158
https://android-review.googlesource.com/c/platform/tools/currysrc/+/1331085

(29) Error 29 – packages/apps/Bluetooth/src/com/android/bluetooth/mapclient

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
packages/apps/Bluetooth/src/com/android/bluetooth/mapclient/MapClientService.java:440: error: Binder is not abstract and does not override abstract method setMessageStatus(BluetoothDevice,String,int) in IBluetoothMapClient
private static class Binder extends IBluetoothMapClient.Stub implements IProfileServiceBinder {
^
1 error
packages/apps/Bluetooth/src/com/android/bluetooth/mapclient/MceStateMachine.java:349: error: cannot find symbol
case BluetoothMapClient.UNREAD:
^
symbol: variable UNREAD
location: class BluetoothMapClient
packages/apps/Bluetooth/src/com/android/bluetooth/mapclient/MceStateMachine.java:354: error: cannot find symbol
case BluetoothMapClient.READ:
^
symbol: variable READ
location: class BluetoothMapClient
...
8 errors

将master分之上”1212983”修改cherry-pick到本地:

1
https://android-review.googlesource.com/c/platform/frameworks/base/+/1212983

注:同步检查关联的git仓中提交是否同步到本地:

1
2
https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1212451
https://android-review.googlesource.com/c/platform/system/bt/+/1212761