sys-libs/bionic: specify target arch.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

3 files changed, 77 insertions, 2 deletions

diff --git a/sys-libs/bionic/Manifest b/sys-libs/bionic/Manifest
index e2f13be..2ec0983 100644
--- a/sys-libs/bionic/Manifest
+++ b/sys-libs/bionic/Manifest
@@ -1,3 +1,4 @@
+AUX amd64-soong.variables 1816 BLAKE2B 1e9517739ddb81abf79643dbc0dd5d9431a43dcd94d28f8cc75f1ba13961768a882379bda3b58dba3c290010e8b64a2d4e63497080561fe84fb0ccd2e80695bc SHA512 97f9bddd86c228c75a53ece728b44fb890d737dc2ef422ae7c074169f657e66e084523d7efbb5f0eb37823a2a58e8bfb4aa66e09b5e2a6c6f3be1ff114dec0c5
 DIST bionic-8.1.0_p41.tar.gz 3517518 BLAKE2B 4c5121cda0e3562b3b65d8e7fa621c6e231973077d582b7d4abf861d03533fd4881901bd48ec971d5baaf155dc8f1a92eb62068a910199fa751fb3001d20d0ba SHA512 b110b46e9f67174f8f30f3b8da0e0fa02c42f2dbb5ced6a9ba9ad948d6cd0a82c1850e8a8d4cd5f3b81ad286e9eb400236fb5320ab02b72f44a0510829cd3e6d
 DIST build-8.1.0_p41.tar.gz 2587534 BLAKE2B 5a0eb0dab1d41c60b8eb2e14c5f6e82584ed57e63541fcfc1087f841d8206bb45302b341cff5754ca641e392ed3cccca7ab4609932620fe100aba37ff61679b1 SHA512 a4b0f24800055cc9e433b578c9e1ae7f511959512459cb916b63fd3ec9312fe272858117f15beea28a60464a04fd8fd17a7bfb6772b346edecfb387aad89a97d
 DIST compiler-rt-8.1.0_p41.tar.gz 2377259 BLAKE2B 09104aba4ef1dc9ce18609cae395f3849d3df6dbb9b9759c3a1532759afd52d7af37475df21ae2db3bbea0891f9974785833405c3731d0082e749c304a86bc89 SHA512 9472ca3fed7a0215f6bd7506f5ba722891c65f9a88a4296c57a69bd038854ad416b7ce433d11451408c632ec23b3f19c4a3fc6373a7955c27563d7786301b6de
@@ -10,5 +11,5 @@ DIST libunwind_llvm-8.1.0_p41.tar.gz 90999 BLAKE2B 3ebd73a228513548ee9f6f84ab221
 DIST lzma-8.1.0_p41.tar.gz 733693 BLAKE2B 733b0995778adce01af50b9f22276ec4a54d3c73ff7b9709a6b3c0327dd89c0a785cb991dbd3343e4e7b9c5eb9009afaea3d78db993a48e1dcbaa9807fdaf7ff SHA512 4cebceabb9096c19ccf3ab25ef27d4ce6f1655e431c6381f888345613f310509864135bc0ee7fd78dc5f1170521effea2113f149e71cca56a07254566755c0c5
 DIST safe-iop-8.1.0_p41.tar.gz 10800 BLAKE2B 02959e9a0f02259362bfbe840eae50bdfa429b09de8f56f8beec2f99697eabb4a0a71a175a79a52f943facded257a68bff383a53acbe61249b76fe2ff95911e1 SHA512 8b717408601194b76a6a44fec5bd62ff2121b89f5f8fea7b3eee7ca46c122e346f8d73d92f5b34575318b1015e74186affda1e1aca7b53ac9c3c303d4e8e7710
 DIST zlib-8.1.0_p41.tar.gz 607311 BLAKE2B b175cf9d4548df24cfd587abea62ee4c3dcee56f6a68b4044c4b1419be148ab4542c42cb19ce0d773b247ceaf3193afca385170674c9d6d2f92a4df8f6d346ba SHA512 0d587729c1210ee6efa6bb7cdac723da71a9c56252be67f6973e80c3597dbb7f2c96ea093078e580d97709de5e8d8fabf92aae0594f382b95e2d9559e43953d2
-EBUILD bionic-8.1.0_p41.ebuild 2415 BLAKE2B 4ff68ae05a15ddfa14fc06b22c6c9aa5b7be09dbf3435f754f5b7b4943b0c417d65f7f777bd630cb1872196d93fd9937178ea0fb85adaa374490e008701192fd SHA512 c9336c0d158d9971a55bccbb5960b9c95e0176a1743da4a0e5a6f5c96a64c08c2d1b36bdc9bce8884b16f6f4714cc06ac2c7f4b6a42229706590ff7a03bf4750
+EBUILD bionic-8.1.0_p41.ebuild 2538 BLAKE2B ccb4d80d472569363e5f917c30184212fd4c7458cf562e0271469ecd36d32ba1a0820c258eca3f32fcf7f20b00b34fb8e3b7278a54f2fd98be0e9f1bc3e2dbc2 SHA512 e9fe07a0de93a185d63b9ee1a811aacb0ff1ca70a487a41aa20739258bf10c6b98e3de78b231498f82cc75f844a89f7939997b0c479edea4e1f07920f021ef81
 MISC metadata.xml 242 BLAKE2B 08b4880748ab6d685ce28f65a9f6cc5ad62deff8f85d4e0a55a3dc12aa8bd63cf1de56b28ff89929e054a6831e223d6ef0207e8b19c6887f09ee22621bd76928 SHA512 ae57aaeecc094cffa640d88329a0baa6c2b0703330d84f6406f3f68d8bb9b724d2e19a8478be8708de284db9ac452f95f225a9f79cd1c5d0236aa2f9935b9b21
diff --git a/sys-libs/bionic/bionic-8.1.0_p41.ebuild b/sys-libs/bionic/bionic-8.1.0_p41.ebuild
index fadea15..e28615e 100644
--- a/sys-libs/bionic/bionic-8.1.0_p41.ebuild
+++ b/sys-libs/bionic/bionic-8.1.0_p41.ebuild
@@ -33,7 +33,7 @@ src_prepare() {
 	default
 	# We are building a minimal bionic for toolchains. Ignore the
 	# advanced optional features like tests and debug tools.
-	rm -r ${PN}/{tests,tools,benchmarks,libc/malloc_debug} || die
+	rm -r ${PN}/{tests,tools,benchmarks,libc/malloc_debug} build/tools/acp || die
 
 	cp "${EPREFIX}"/usr/share/soong/root.bp Android.bp || die
 	cat >> Android.bp <<EOF || die
@@ -63,6 +63,8 @@ EOF
 	sed -e '/ANDROIDMK TRANSLATION ERROR/,$d' -i external/compiler-rt/lib/asan/Android.bp || die
 	sed -e '/llvm-headers/d' -i system/core/libbacktrace/Android.bp || die
 	mkdir out || die
+	echo "{}" >> out/soong.config || die
+	cp "${FILESDIR}"/${ARCH}-soong.variables out/soong.variables || die
 	rm ${PN}/libc/versioner-dependencies/common/clang-builtins || die
 }
 
diff --git a/sys-libs/bionic/files/amd64-soong.variables b/sys-libs/bionic/files/amd64-soong.variables
new file mode 100644
index 0000000..9b1aebd
--- /dev/null
+++ b/sys-libs/bionic/files/amd64-soong.variables
@@ -0,0 +1,72 @@
+{
+"Lineage": {
+    "Has_legacy_camera_hal1": false,
+    "Needs_text_relocations": false,
+    "Specific_camera_parameter_library": "",
+    "Target_shim_libs": "",
+    "Uses_generic_camera_parameter_library": true,
+    "Uses_nvidia_enhancements": false,
+    "Uses_qcom_bsp_legacy": false,
+    "Uses_qti_camera_device": false
+},
+
+    "Make_suffix": "-aosp_x86_64",
+
+    "Platform_sdk_version": 27,
+    "Platform_version_all_codenames": ["REL"],
+    "Unbundled_build": false,
+    "Brillo": false,
+    "Malloc_not_svelte": true,
+    "Allow_missing_dependencies": true,
+    "SanitizeHost": [],
+    "SanitizeDevice": [],
+    "SanitizeDeviceDiag": [],
+    "SanitizeDeviceArch": [],
+    "HostStaticBinaries": false,
+    "Binder32bit": false,
+    "DevicePrefer32BitExecutables": false,
+    "UseGoma": false,
+    "Debuggable": true,
+    "Eng": true,
+    "VendorPath": "vendor",
+
+    "ClangTidy": false,
+    "TidyChecks": "",
+
+    "NativeCoverage": false,
+    "CoveragePaths": [],
+    "CoverageExcludePaths": [],
+
+    "DeviceName": "generic_x86_64",
+    "DeviceArch": "x86_64",
+    "DeviceArchVariant": "x86_64",
+    "DeviceCpuVariant": "",
+    "DeviceAbi": ["x86_64", ""],
+    "DeviceUsesClang": true,
+    "DeviceVndkVersion": "",
+
+    "DeviceSecondaryArch": "x86",
+    "DeviceSecondaryArchVariant": "x86_64",
+    "DeviceSecondaryCpuVariant": "",
+    "DeviceSecondaryAbi": ["x86", ""],
+
+    "HostArch": "x86_64",
+    "HostSecondaryArch": "x86",
+
+    "CrossHost": "windows",
+    "CrossHostArch": "x86",
+    "CrossHostSecondaryArch": "x86_64",
+    "Safestack": false,
+    "EnableCFI": true,
+    "IntegerOverflowExcludePaths": ["",""],
+    "Device_uses_hwc2": true,
+    "Override_rs_driver": "",
+    "Treble": true,
+    "Pdk": false,
+
+    "ArtUseReadBarrier": true,
+
+    "BtConfigIncludeDir": "",
+
+    "DeviceKernelHeaders": []
+}