Remove the "stem" field from a target definition
This CL modifies the target definition for the `log` crate by removing
the "stem" field. Previously Soong was building static versions of this
library as `liblog.rlib`. Unfortunately rustc would find `liblog.a`,
the C++ loging implementation, and assume it was the required static
library for the `log` crate and pass that into the linker, resuling in
linker confusion as expected symbols were missing.
The CleanSpec.mk file is needed to remove the intermediate directory for
the targets for this crate. If both `liblog.dylib.so` and
`liblog_rust.dylib.so` are in the same directory the resulting
`keystore2` binary will crash when the device boots.
Test: Cherry-Pick ag/21614245 and run `m libukey2_jni_shared`
Change-Id: I547f7b9f8c9b3443b874f632a88cfa7e3f86270e
diff --git a/Android.bp b/Android.bp
index 419bb08..52b8f4f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -39,7 +39,6 @@
rust_library {
name: "liblog_rust",
- stem: "liblog",
host_supported: true,
crate_name: "log",
cargo_env_compat: true,
@@ -68,7 +67,7 @@
host_supported: true,
crate_name: "log",
cargo_env_compat: true,
- cargo_pkg_version: "0.4.14",
+ cargo_pkg_version: "0.4.17",
srcs: ["src/lib.rs"],
edition: "2015",
cfgs: [
diff --git a/CleanSpec.mk b/CleanSpec.mk
new file mode 100644
index 0000000..03e4adc
--- /dev/null
+++ b/CleanSpec.mk
@@ -0,0 +1,51 @@
+# Copyright (C) 2023 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# If you don't need to do a full clean build but would like to touch
+# a file or delete some intermediate files, add a clean step to the end
+# of the list. These steps will only be run once, if they haven't been
+# run before.
+#
+# E.g.:
+# $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
+# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
+#
+# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
+# files that are missing or have been moved.
+#
+# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
+# Use $(OUT_DIR) to refer to the "out" directory.
+#
+# If you need to re-do something that's already mentioned, just copy
+# the command and add it to the bottom of the list. E.g., if a change
+# that you made last week required touching a file and a change you
+# made today requires touching the same file, just copy the old
+# touch step and add it to the end of the list.
+#
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
+
+# For example:
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
+#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
+#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
+
+$(call add-clean-step, rm -rf $(OUT_DIR)/soong/.intermediates/external/rust/crates/log)
+
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
diff --git a/cargo2android.json b/cargo2android.json
index 792a0d1..f145d4c 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -9,5 +9,10 @@
"features": "std",
"min-sdk-version": "29",
"run": true,
- "vendor-available": true
+ "vendor-available": true,
+ "variants": [
+ {
+ "suffix": "_rust"
+ }
+ ]
}
\ No newline at end of file
diff --git a/cargo2android_nostd.bp b/cargo2android_nostd.bp
index 7b47f41..e5ead1f 100644
--- a/cargo2android_nostd.bp
+++ b/cargo2android_nostd.bp
@@ -3,7 +3,7 @@
host_supported: true,
crate_name: "log",
cargo_env_compat: true,
- cargo_pkg_version: "0.4.14",
+ cargo_pkg_version: "0.4.17",
srcs: ["src/lib.rs"],
edition: "2015",
cfgs: [
