aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2020-09-24 01:25:13 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-24 01:25:13 +0000
commitb786f3fc7d802eb371da8f2d64652982290a02e5 (patch)
tree2e7375c5d702cf70b57af1bd28f331519597b799
parentc5e6274f72ec7b75cd77975fd621887961cc90c8 (diff)
parent91eff0601704c52bff3754d327eb5b9b8a39fa3d (diff)
downloadclang-sys-b786f3fc7d802eb371da8f2d64652982290a02e5.tar.gz
Add post_update.sh and regenerate .bp am: 0bd5ab11c9 am: 44ea9e98d8 am: 91eff06017
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/clang-sys/+/1434797 Change-Id: I2140140a0b65b04a8e12e3837b33659aec05190d
-rw-r--r--Android.bp6
-rwxr-xr-xpost_update.sh21
2 files changed, 24 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index 35de6b8..3824501 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2,7 +2,6 @@
rust_library_host {
name: "libclang_sys",
- // has rustc warnings
crate_name: "clang_sys",
srcs: ["src/lib.rs"],
edition: "2015",
@@ -30,6 +29,7 @@ rust_library_host {
}
// dependent_library ["feature_list"]
+// cfg-if-0.1.10
// glob-0.3.0
-// libc-0.2.71
-// libloading-0.6.2
+// libc-0.2.77
+// libloading-0.6.3
diff --git a/post_update.sh b/post_update.sh
new file mode 100755
index 0000000..bfcef00
--- /dev/null
+++ b/post_update.sh
@@ -0,0 +1,21 @@
+#!/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