diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-15 23:53:25 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-15 23:53:25 +0000 |
| commit | 9d850a6b3b8e5405b2d01f25e3844f88b4e29fcd (patch) | |
| tree | c049a43b521f2c17de00bb579c91f49245edca8a | |
| parent | 633cc5606d617cbbc135a451f87938bd2bfa65a6 (diff) | |
| parent | cf25352fcaeacb975f5824787ab671b4339b90d6 (diff) | |
| download | development-9d850a6b3b8e5405b2d01f25e3844f88b4e29fcd.tar.gz | |
Merge cherrypicks of [7534696, 7534697, 7534649, 7533589, 7533590, 7533591, 7533592, 7534653, 7534654, 7534758, 7534628, 7534655, 7534629, 7534630, 7533594, 7534779, 7534771, 7535018, 7534136, 7533725, 7533726, 7535065, 7535066, 7533727, 7534940, 7533192, 7535067, 7535023, 7535024, 7533728, 7533729, 7533730, 7533731, 7535026, 7533732, 7534941, 7534942, 7534943, 7535068, 7535069, 7534944, 7535028, 7535070, 7535071, 7535073, 7535534, 7535029, 7535030, 7535077, 7535600, 7535602, 7535037, 7535718, 7535719, 7534948, 7535609, 7535610, 7535725, 7534949, 7535611, 7535612, 7535780, 7535613, 7535614, 7534951, 7535726, 7534952, 7535838, 7535727] into qt-release
Change-Id: Ib185404da125bf3d13bca76b51b84d41291e741c
| -rw-r--r-- | sdk/build_tools_source.prop_template | 4 | ||||
| -rw-r--r-- | sdk/platform_source.prop_template | 2 | ||||
| -rw-r--r-- | vndk/tools/definition-tool/datasets/vndk-lib-extra-list-29.txt | 45 |
3 files changed, 48 insertions, 3 deletions
diff --git a/sdk/build_tools_source.prop_template b/sdk/build_tools_source.prop_template index d1ffb8c5a..3a647b60c 100644 --- a/sdk/build_tools_source.prop_template +++ b/sdk/build_tools_source.prop_template @@ -1,3 +1,3 @@ Pkg.UserSrc=false -#Pkg.Revision=${PLATFORM_SDK_VERSION}.0.3 -Pkg.Revision=29.0.0 rc4 +Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0 +#Pkg.Revision=29.0.0 rc4 diff --git a/sdk/platform_source.prop_template b/sdk/platform_source.prop_template index ff513ff0c..35a00af81 100644 --- a/sdk/platform_source.prop_template +++ b/sdk/platform_source.prop_template @@ -2,7 +2,7 @@ Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION} Pkg.UserSrc=false Platform.Version=${PLATFORM_VERSION} Platform.CodeName= -Pkg.Revision=4 +Pkg.Revision=1 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} Layoutlib.Api=15 diff --git a/vndk/tools/definition-tool/datasets/vndk-lib-extra-list-29.txt b/vndk/tools/definition-tool/datasets/vndk-lib-extra-list-29.txt new file mode 100644 index 000000000..38d4bce4a --- /dev/null +++ b/vndk/tools/definition-tool/datasets/vndk-lib-extra-list-29.txt @@ -0,0 +1,45 @@ +FWK-ONLY-RS: libft2.so +FWK-ONLY-RS: libmediandk.so + +LLNDK: libclang_rt.asan-aarch64-android.so +LLNDK: libclang_rt.asan-arm-android.so +LLNDK: libclang_rt.asan-i686-android.so +LLNDK: libclang_rt.asan-mips-android.so +LLNDK: libclang_rt.asan-mips64-android.so +LLNDK: libclang_rt.asan-x86_64-android.so + +VNDK-core: libclang_rt.scudo-aarch64-android.so +VNDK-core: libclang_rt.scudo-arm-android.so +VNDK-core: libclang_rt.scudo-i686-android.so +VNDK-core: libclang_rt.scudo-x86_64-android.so + +VNDK-core: libclang_rt.scudo_minimal-aarch64-android.so +VNDK-core: libclang_rt.scudo_minimal-arm-android.so +VNDK-core: libclang_rt.scudo_minimal-i686-android.so +VNDK-core: libclang_rt.scudo_minimal-x86_64-android.so + +VNDK-core: libclang_rt.ubsan_standalone-aarch64-android.so +VNDK-core: libclang_rt.ubsan_standalone-arm-android.so +VNDK-core: libclang_rt.ubsan_standalone-i686-android.so +VNDK-core: libclang_rt.ubsan_standalone-mips-android.so +VNDK-core: libclang_rt.ubsan_standalone-mips64-android.so +VNDK-core: libclang_rt.ubsan_standalone-x86_64-android.so + +LLNDK-private: ld-android.so +LLNDK-private: libc_malloc_debug.so +LLNDK-private: libdl_android.so +LLNDK-private: libnetd_client.so +LLNDK-private: libtextclassifier_hash.so + +# Same-Process HAL implementations +SP-HAL: [regex]^.*/android\.hardware\.graphics\.mapper@\d+\.\d+-impl\.so$ +SP-HAL: [regex]^.*/android\.hardware\.renderscript@1\.0-impl\.so$ +SP-HAL: [regex]^.*/gralloc\..*\.so$ +SP-HAL: [regex]^/vendor/.*/libEGL_.*\.so$ +SP-HAL: [regex]^/vendor/.*/libGLES_.*\.so$ +SP-HAL: [regex]^/vendor/.*/libGLESv1_CM_.*\.so$ +SP-HAL: [regex]^/vendor/.*/libGLESv2_.*\.so$ +SP-HAL: [regex]^/vendor/.*/libGLESv3_.*\.so$ +SP-HAL: [regex]^/vendor/.*/libPVRRS\.so$ +SP-HAL: [regex]^/vendor/.*/libRSDriver.*\.so$ +SP-HAL: [regex]^/vendor/.*/vulkan.*\.so$ |