commit c1dea4a34e02f71f53cf0287c473bec9ca7fc278
author Nicolas Geoffray <ngeoffray@google.com> Mon Nov 10 08:33:52 2014 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Mon Nov 10 08:35:02 2014 +0000
tree db9de8d4a9a3e5a32a44f3eb34fb78f6f59fb6e2
parent ec17bd1d052ce9d640be5ea7f089c9eb74da55e1

Fix ld_library_path now that a target can be 64bits only.

Change-Id: I7cf3429bb460a784433429da19b201cb2947bc48

build/Android.gtest.mk

diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 56e95b8..1b4616f 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -372,7 +372,11 @@
         2nd_library_path := $$(ART_TEST_ANDROID_ROOT)/lib
         library_path := $$(ART_TEST_ANDROID_ROOT)/lib64
       else
-        library_path := $$(ART_TEST_ANDROID_ROOT)/lib
+        ifneq ($(filter %64,$(TARGET_ARCH)),)
+          library_path := $$(ART_TEST_ANDROID_ROOT)/lib64
+        else
+          library_path := $$(ART_TEST_ANDROID_ROOT)/lib
+        endif
       endif
     endif