diff options
| author | Pirama Arumuga Nainar <pirama@google.com> | 2017-11-09 22:22:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-11-09 22:22:34 +0000 |
| commit | 1973612dcda82cb7cc818785517912a02771556e (patch) | |
| tree | f6dec3c39d59b91e99d096a16b7f950dfae55975 | |
| parent | d149d2008e9a24180c5ae911c2995c6223947829 (diff) | |
| parent | 494c48686f216793d4c56a98386a2c3f2066f499 (diff) | |
| download | libbcc-1973612dcda82cb7cc818785517912a02771556e.tar.gz | |
Merge "Make libbcc depend on libLLVM_android.so" am: 31f568177c
am: 494c48686f
Change-Id: Ia3e98a0b38b563cfedd9235bfcc0992779b07618
| -rw-r--r-- | bcinfo/Android.bp | 4 | ||||
| -rw-r--r-- | lib/Android.bp | 6 | ||||
| -rw-r--r-- | tools/bcc/Android.bp | 2 | ||||
| -rw-r--r-- | tools/bcc_compat/Android.bp | 2 | ||||
| -rw-r--r-- | tools/bcc_strip_attr/Android.bp | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/bcinfo/Android.bp b/bcinfo/Android.bp index 7695fba..af02656 100644 --- a/bcinfo/Android.bp +++ b/bcinfo/Android.bp @@ -67,10 +67,10 @@ cc_library_shared { target: { windows: { enabled: true, - shared_libs: ["libLLVM"], + shared_libs: ["libLLVM_android"], }, darwin: { - shared_libs: ["libLLVM"], + shared_libs: ["libLLVM_android"], }, linux_glibc: { allow_undefined_symbols: true, diff --git a/lib/Android.bp b/lib/Android.bp index 1534521..962d8bf 100644 --- a/lib/Android.bp +++ b/lib/Android.bp @@ -48,10 +48,10 @@ cc_library_shared { target: { windows: { enabled: true, - shared_libs: ["libLLVM"], + shared_libs: ["libLLVM_android"], }, darwin: { - shared_libs: ["libLLVM"], + shared_libs: ["libLLVM_android"], }, linux_glibc: { static_libs: ["libLLVMLinker"], @@ -66,7 +66,7 @@ cc_library_shared { }, android: { shared_libs: [ - "libLLVM", + "libLLVM_android", "libdl", "liblog", ], diff --git a/tools/bcc/Android.bp b/tools/bcc/Android.bp index eecd44d..d26126b 100644 --- a/tools/bcc/Android.bp +++ b/tools/bcc/Android.bp @@ -24,7 +24,7 @@ cc_binary { shared_libs: [ "libbcc", "libbcinfo", - "libLLVM", + "libLLVM_android", ], header_libs: ["slang_headers"], diff --git a/tools/bcc_compat/Android.bp b/tools/bcc_compat/Android.bp index f6cb4df..2cc54c7 100644 --- a/tools/bcc_compat/Android.bp +++ b/tools/bcc_compat/Android.bp @@ -31,7 +31,7 @@ cc_binary_host { shared_libs: [ "libbcc", "libbcinfo", - "libLLVM", + "libLLVM_android", ], header_libs: ["slang_headers"], diff --git a/tools/bcc_strip_attr/Android.bp b/tools/bcc_strip_attr/Android.bp index 59cfe01..b463b2f 100644 --- a/tools/bcc_strip_attr/Android.bp +++ b/tools/bcc_strip_attr/Android.bp @@ -21,5 +21,5 @@ cc_binary_host { defaults: ["libbcc-defaults"], srcs: ["bcc_strip_attr.cpp"], - shared_libs: ["libLLVM"], + shared_libs: ["libLLVM_android"], } |