commit 9b4d4ff353206d4aeff9756bd72c77e205f3311f
author Treehugger Robot <treehugger-gerrit@google.com> Fri Oct 27 01:12:39 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 27 01:12:39 2017 +0000
tree aaa87bc1ed071fe0b8cbe49109a4a6dac60a1e57
parent e714a318ee741609be4845375bdd7ca33b990682
parent b26825730e74c2aa48d39c9c4337ca563a14f987

Merge "Revert "Build only for current architecture by default""

build/Android.bp

diff --git a/build/Android.bp b/build/Android.bp
index 79fbccc..53d461d 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -46,7 +46,6 @@
 fluoride_defaults {
     name: "fluoride_defaults",
     defaults: ["fluoride_types_defaults"],
-    compile_multilib: "first",
     header_libs: ["libbluetooth_headers"],
     static_libs: [
         "libbluetooth-types",

test/run_unit_tests.sh

diff --git a/test/run_unit_tests.sh b/test/run_unit_tests.sh
index 4c390bf..8fe47f8 100755
--- a/test/run_unit_tests.sh
+++ b/test/run_unit_tests.sh
@@ -102,18 +102,11 @@
   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
+  binary="/data/nativetest/${name}/${name}"
 
   push_command=( "${adb[@]}" push {"${ANDROID_PRODUCT_OUT}",}"${binary}" )
   test_command=( "${adb[@]}" shell "${binary}" )

types/Android.bp

diff --git a/types/Android.bp b/types/Android.bp
index 465814b..5867d63 100644
--- a/types/Android.bp
+++ b/types/Android.bp
@@ -10,7 +10,6 @@
     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",