diff options
author | Chih-Hung Hsieh <chh@google.com> | 2020-10-26 21:16:22 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-26 21:16:22 +0000 |
commit | 99c895e54512809b7d22f5efcd9a58d1eeb116ed (patch) | |
tree | d4f396e505d873a57374093a59c80e16281ab922 | |
parent | ffc9a683f6be398976beffdd660092e7faf51fa9 (diff) | |
parent | 24b52c407829fba076314433d6c93cd5065af006 (diff) | |
download | clang-sys-99c895e54512809b7d22f5efcd9a58d1eeb116ed.tar.gz |
Use --copy-out to generate .bp file. am: e11a463438 am: 24b52c4078
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/clang-sys/+/1473517
Change-Id: Iac7137ec98efae003dbe415223aca9e9cc4db0b2
-rw-r--r-- | Android.bp | 23 | ||||
-rwxr-xr-x | post_update.sh | 21 | ||||
-rw-r--r-- | src/link.rs | 4 |
3 files changed, 20 insertions, 28 deletions
@@ -1,9 +1,22 @@ -// This file is generated by cargo2android.py --run --features=runtime,clang_10_0 --dependencies. +// This file is generated by cargo2android.py --run --features=runtime,clang_10_0 --dependencies --copy-out. + +genrule { + name: "copy_clang-sys_build_out", + srcs: ["out/*"], + cmd: "cp $(in) $(genDir)", + out: [ + "common.rs", + "dynamic.rs", + ], +} rust_library_host { name: "libclang_sys", crate_name: "clang_sys", - srcs: ["src/lib.rs"], + srcs: [ + "src/lib.rs", + ":copy_clang-sys_build_out", + ], edition: "2015", features: [ "clang_10_0", @@ -29,7 +42,7 @@ rust_library_host { } // dependent_library ["feature_list"] -// cfg-if-0.1.10 +// cfg-if-1.0.0 // glob-0.3.0 -// libc-0.2.77 -// libloading-0.6.3 +// libc-0.2.80 +// libloading-0.6.5 diff --git a/post_update.sh b/post_update.sh deleted file mode 100755 index bfcef00..0000000 --- a/post_update.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -# $1 Path to the new version. -# $2 Path to the old version. - -set -x -set -e - -# Change src/link.rs to include files from ../out/ -SRCFILE=src/link.rs -OLDSTR='include!(concat!(env!("OUT_DIR"), "/common.rs"));' -NEWSTR='include!("../out/common.rs");' -sed -i -e "s:$OLDSTR:$NEWSTR:" $SRCFILE -# Make sure that sed replaced $OLDSTR with $NEWSTR -grep "$NEWSTR" $SRCFILE > /dev/null - -OLDSTR='include!(concat!(env!("OUT_DIR"), "/dynamic.rs"));' -NEWSTR='include!("../out/dynamic.rs");' -sed -i -e "s:$OLDSTR:$NEWSTR:" $SRCFILE -# Make sure that sed replaced $OLDSTR with $NEWSTR -grep "$NEWSTR" $SRCFILE > /dev/null diff --git a/src/link.rs b/src/link.rs index 082eb81..3471549 100644 --- a/src/link.rs +++ b/src/link.rs @@ -186,8 +186,8 @@ macro_rules! link { /// * the `libclang` shared library could not be opened pub fn load_manually() -> Result<SharedLibrary, String> { mod build { - pub mod common { include!("../out/common.rs"); } - pub mod dynamic { include!("../out/dynamic.rs"); } + pub mod common { include!(concat!(env!("OUT_DIR"), "/common.rs")); } + pub mod dynamic { include!(concat!(env!("OUT_DIR"), "/dynamic.rs")); } } let (directory, filename) = build::dynamic::find(true)?; |