summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPirama Arumuga Nainar <pirama@google.com>2017-07-27 23:54:54 -0700
committerPirama Arumuga Nainar <pirama@google.com>2017-07-28 00:37:10 -0700
commitda3c0788791e570c8c04f1b9a824f89191df56df (patch)
tree48418ba763e52c417017bcc15aac020c2f153b4a
parent60c4fcc60f21303cdd17d21d10d4adfd5978982a (diff)
downloadrs-da3c0788791e570c8c04f1b9a824f89191df56df.tar.gz
Build and package lib{LLVM,clang}_android.so
Bug: http://b/64121881 This is the first step before updating prebuilts and switching RS modules to depend on these renamed libraries instead of libLLVM.so and libclang.so. Test: python frameworks/rs/build-rs.py Change-Id: Id85283bde550b18aebbab6ad6c386aadbcd823c8
-rw-r--r--Android.mk4
-rwxr-xr-xbuild_rs.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index ffd9be3d..a64fc081 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,7 +14,9 @@ rs-prebuilts-full: \
librsrt_arm64.bc \
librsrt_mips.bc \
librsrt_x86.bc \
- librsrt_x86_64.bc
+ librsrt_x86_64.bc \
+ libLLVM_android-host64 \
+ libclang_android-host64
ifneq ($(HOST_OS),darwin)
rs-prebuilts-full: \
diff --git a/build_rs.py b/build_rs.py
index 99ba20c5..58153210 100755
--- a/build_rs.py
+++ b/build_rs.py
@@ -169,6 +169,8 @@ def install_built_host_files(build_dir, install_dir, host):
'lib64/libclang' + lib_ext,
'lib64/libLLVM' + lib_ext,
'lib64/libc++' + lib_ext,
+ 'lib64/libclang_android' + lib_ext,
+ 'lib64/libLLVM_android' + lib_ext,
])
for built_file in built_files: