| commit | 554b6600c6a767deb096d97f10f9fa41cceacc88 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Sun Mar 25 20:50:06 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sun Mar 25 20:50:06 2012 -0700 |
| tree | 69823044a1283ea9eb58815ec3d54190bc76f613 | |
| parent | 8771a2fe9f5892fa4646cf50ae728f54b427356f [diff] | |
| parent | 26b8c9d432adc2fc71438050377cb6106dffde1a [diff] |
Merge "Fix sdk_x86 build" into dalvik-dev
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index c85b170..790765b 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk
@@ -57,7 +57,7 @@ ifeq ($(ART_USE_LLVM_COMPILER),true) LOCAL_C_INCLUDES += frameworks/compile/linkloader - LOCAL_STATIC_LIBRARIES += librsloader libcutils + LOCAL_STATIC_LIBRARIES += librsloader endif # Mac OS linker doesn't understand --export-dynamic.