Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 345b1007 authored by Pavlin Radoslavov's avatar Pavlin Radoslavov Committed by Jakub Pawlowski
Browse files

Revert "Build only for current architecture by default" 

This reverts commit f08d6079.

The result audio.a2dp.default.so shared library is only 64-bit,
and it can't be used by the audioserver which is still 32-bit only

Bug: 68127690
Change-Id: I60b15c32425db3b2ada687fa8d0dcb728cf1812f
Test: A2DP streaming
parent 9d9e1fca

system/build/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ fluoride_defaults { 
fluoride_defaults {

    name: "fluoride_defaults",

    defaults: ["fluoride_types_defaults"],

    compile_multilib: "first",

    header_libs: ["libbluetooth_headers"],

    static_libs: [

        "libbluetooth-types",

system/test/run_unit_tests.sh

+1 −8
Original line number Diff line number Diff line
@@ -102,18 +102,11 @@ if [ -n "${device}" ]; then 
  adb+=( "-s" "${device}" )

fi



source ${ANDROID_BUILD_TOP}/build/envsetup.sh

target_arch=$(gettargetarch)



failed_tests=()

for spec in "${tests[@]}"

do

  name="${spec%%.*}"

  if [[ $target_arch == *"64"* ]]; then

    binary="/data/nativetest64/${name}/${name}"

  else

  binary="/data/nativetest/${name}/${name}"

  fi



  push_command=( "${adb[@]}" push {"${ANDROID_PRODUCT_OUT}",}"${binary}" )

  test_command=( "${adb[@]}" shell "${binary}" )

system/types/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ cc_library_static { 
    name: "libbluetooth-types",

    vendor_available: true,

    defaults: ["fluoride_types_defaults"],

    compile_multilib: "both",

    cflags: [

        /* we export all classes, so change default visibility, instead of having EXPORT_SYMBOL on each class*/

        "-fvisibility=default",