diff options
| author | Colin Cross <ccross@android.com> | 2015-04-20 18:05:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-20 18:05:29 +0000 |
| commit | b2b06de5fc9605919a06d7757c8ef4a7a48f3e87 (patch) | |
| tree | f4d880036797da8d536b7ea1d4b9ae9d8fb6be4b /adb/Android.mk | |
| parent | 63fba52c2cc90c237df85bc76c364a1deec0b081 (diff) | |
| parent | 55bf5f0017a76df0a97ec35f092054ef6f33c713 (diff) | |
| download | system_core-b2b06de5fc9605919a06d7757c8ef4a7a48f3e87.zip system_core-b2b06de5fc9605919a06d7757c8ef4a7a48f3e87.tar.gz system_core-b2b06de5fc9605919a06d7757c8ef4a7a48f3e87.tar.bz2 | |
Merge "statically link adb and fastboot against libc++"
Diffstat (limited to 'adb/Android.mk')
| -rw-r--r-- | adb/Android.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/adb/Android.mk b/adb/Android.mk index f0117d3..3c48585 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -165,6 +165,13 @@ LOCAL_STATIC_LIBRARIES := \ libcutils \ $(EXTRA_STATIC_LIBS) \ +LOCAL_CXX_STL := libc++_static + +# Don't add anything here, we don't want additional shared dependencies +# on the host adb tool, and shared libraries that link against libc++ +# will violate ODR +LOCAL_SHARED_LIBRARIES := + include $(BUILD_HOST_EXECUTABLE) $(call dist-for-goals,dist_files sdk,$(LOCAL_BUILT_MODULE)) |