diff options
author | Bruno Martins <bgcngm@gmail.com> | 2023-10-24 12:07:53 +0100 |
---|---|---|
committer | alk3pInjection <webmaster@raspii.tech> | 2023-12-31 09:23:16 +0800 |
commit | 331d7f53896c4bf99d48106e2ec08f7d79d788a0 (patch) | |
tree | a2cc00511ab2311f4b779b08af25a1b66e61641b | |
parent | cd1afb523d7ea8f0b62babe0e55c666a817b58f8 (diff) |
Android moved to a versioned approach in R and vendorcompat libs were
still possible to build, but not anymore with the Android U release.
Also includes squashed changes:
Author: LuK1337 <priv.luk@gmail.com>
Date: Tue Oct 10 01:12:12 2023 +0200
compat: Add libprotobuf-cpp-lite-3.9.1-vendorcompat
Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
Change-Id: I5e3a64036907ee5d8495333de2da6bb93f295730
Author: Michael Bestas <mkbestas@lineageos.org>
Date: Sat Nov 18 01:58:07 2023 +0200
libprotobuf-cpp-lite-3.9.1-vendorcompat: Fix build for x86/x86_64 targets
Change-Id: I2bebcbc93edb0695095a8bced405c11ac52d953e
Author: Steven Moreland <smoreland@google.com>
Date: Tue, 15 Jan 2019 16:56:32 -0800
Replace clang-format with symlink.
Automatic consistency.
Bug: 122835115
Test: manual
Change-Id: I6583f9f7923a822aa11f1839fbf375c1063a89c6
Change-Id: Ibe06bf8d22ab0ce24ac5d5d9f3394b8593ee46cb
l--------- | .clang-format | 1 | ||||
-rw-r--r-- | Android.bp | 57 | ||||
l--------- | vndk/v29/arm/libprotobuf-cpp-full.so | 1 | ||||
l--------- | vndk/v29/arm/libprotobuf-cpp-lite.so | 1 | ||||
l--------- | vndk/v29/arm64/libprotobuf-cpp-full.so | 1 | ||||
l--------- | vndk/v29/arm64/libprotobuf-cpp-lite.so | 1 |
6 files changed, 62 insertions, 0 deletions
diff --git a/.clang-format b/.clang-format new file mode 120000 index 0000000..973b2fa --- /dev/null +++ b/.clang-format @@ -0,0 +1 @@ +../../../build/soong/scripts/system-clang-format
\ No newline at end of file diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..c5c41aa --- /dev/null +++ b/Android.bp @@ -0,0 +1,57 @@ +// +// Copyright (C) 2023 The LineageOS Project +// +// SPDX-License-Identifier: Apache-2.0 +// + +cc_library_shared { + name: "libprotobuf-cpp-lite-3.9.1-vendorcompat", + stem: "libprotobuf-cpp-lite-3.9.1", + target: { + android_arm: { + shared_libs: ["libprotobuf-cpp-full-3.9.1-vendorcompat"], + }, + android_arm64: { + shared_libs: ["libprotobuf-cpp-full-3.9.1-vendorcompat"], + }, + }, + vendor: true, +} + +cc_prebuilt_library_shared { + name: "libprotobuf-cpp-full-vendorcompat", + stem: "libprotobuf-cpp-full", + vendor: true, + strip: { + none: true, + }, + target: { + android_arm: { + srcs: ["vndk/v29/arm/libprotobuf-cpp-full.so"], + }, + android_arm64: { + srcs: ["vndk/v29/arm64/libprotobuf-cpp-full.so"], + }, + }, + compile_multilib: "both", + check_elf_files: false, +} + +cc_prebuilt_library_shared { + name: "libprotobuf-cpp-lite-vendorcompat", + stem: "libprotobuf-cpp-lite", + vendor: true, + strip: { + none: true, + }, + target: { + android_arm: { + srcs: ["vndk/v29/arm/libprotobuf-cpp-lite.so"], + }, + android_arm64: { + srcs: ["vndk/v29/arm64/libprotobuf-cpp-lite.so"], + }, + }, + compile_multilib: "both", + check_elf_files: false, +} diff --git a/vndk/v29/arm/libprotobuf-cpp-full.so b/vndk/v29/arm/libprotobuf-cpp-full.so new file mode 120000 index 0000000..2c8c152 --- /dev/null +++ b/vndk/v29/arm/libprotobuf-cpp-full.so @@ -0,0 +1 @@ +../../../../../../prebuilts/vndk/v29/arm64/arch-arm-armv8-a/shared/vndk-core/libprotobuf-cpp-full.so
\ No newline at end of file diff --git a/vndk/v29/arm/libprotobuf-cpp-lite.so b/vndk/v29/arm/libprotobuf-cpp-lite.so new file mode 120000 index 0000000..4b3896e --- /dev/null +++ b/vndk/v29/arm/libprotobuf-cpp-lite.so @@ -0,0 +1 @@ +../../../../../../prebuilts/vndk/v29/arm64/arch-arm-armv8-a/shared/vndk-core/libprotobuf-cpp-lite.so
\ No newline at end of file diff --git a/vndk/v29/arm64/libprotobuf-cpp-full.so b/vndk/v29/arm64/libprotobuf-cpp-full.so new file mode 120000 index 0000000..caba7cb --- /dev/null +++ b/vndk/v29/arm64/libprotobuf-cpp-full.so @@ -0,0 +1 @@ +../../../../../../prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-core/libprotobuf-cpp-full.so
\ No newline at end of file diff --git a/vndk/v29/arm64/libprotobuf-cpp-lite.so b/vndk/v29/arm64/libprotobuf-cpp-lite.so new file mode 120000 index 0000000..a4bac2e --- /dev/null +++ b/vndk/v29/arm64/libprotobuf-cpp-lite.so @@ -0,0 +1 @@ +../../../../../../prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-core/libprotobuf-cpp-lite.so
\ No newline at end of file |