diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-05-26 07:09:38 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-05-26 07:09:38 +0000 |
| commit | fa1917c4d799eb5a35ac04914f6ebdce6bbc8523 (patch) | |
| tree | 64571987dcb20143ea8f4dcf8b6eed8d69f7a419 | |
| parent | 3594cea1454dda72860dd5c6f4a814f24c192023 (diff) | |
| parent | 8f20f6dca4a4b939d4cd142586f9f4c389e894a6 (diff) | |
| download | log-busytown-mac-infra-release.tar.gz | |
Snap for 11878398 from 8f20f6dca4a4b939d4cd142586f9f4c389e894a6 to busytown-mac-infra-releasebusytown-mac-infra-release
Change-Id: Ic942ba0ecd14d7eda43fb08ade60cbb2ab138f0d
| -rw-r--r-- | Android.bp | 8 | ||||
| -rw-r--r-- | patches/rules.mk.diff | 28 | ||||
| -rw-r--r-- | rules.mk | 13 |
3 files changed, 15 insertions, 34 deletions
@@ -1,5 +1,7 @@ // This file is generated by cargo_embargo. -// Do not modify this file as changes will be overridden on upgrade. +// Do not modify this file after the first "rust_*" or "genrule" module +// because the changes will be overridden on upgrade. +// Content before the first "rust_*" or "genrule" module is preserved. package { default_applicable_licenses: ["external_rust_crates_log_license"], @@ -43,7 +45,7 @@ rust_library { crate_name: "log", cargo_env_compat: true, cargo_pkg_version: "0.4.17", - srcs: ["src/lib.rs"], + crate_root: "src/lib.rs", edition: "2015", features: ["std"], cfgs: [ @@ -77,7 +79,7 @@ rust_library_rlib { crate_name: "log", cargo_env_compat: true, cargo_pkg_version: "0.4.17", - srcs: ["src/lib.rs"], + crate_root: "src/lib.rs", edition: "2015", cfgs: [ "atomic_cas", diff --git a/patches/rules.mk.diff b/patches/rules.mk.diff index 6f870bc..cdd223e 100644 --- a/patches/rules.mk.diff +++ b/patches/rules.mk.diff @@ -1,22 +1,12 @@ -diff --git a/rules.mk b/rules.mk -index 425fd1c..1f25698 100644 ---- a/rules.mk -+++ b/rules.mk -@@ -14,5 +14,17 @@ MODULE_RUSTFLAGS += \ - +diff --git b/rules.mk a/rules.mk +index 481dd29..329d328 100644 +--- b/rules.mk ++++ a/rules.mk +@@ -15,7 +15,5 @@ MODULE_RUSTFLAGS += \ MODULE_LIBRARY_DEPS := \ external/rust/crates/cfg-if \ -+ external/rust/crates/serde \ -+ -+ifeq ($(call TOBOOL,$(TRUSTY_USERSPACE)),false) -+ -+# avoid cyclic dependence by adding dependencies manually -+MODULE_ADD_IMPLICIT_DEPS := false -+ -+MODULE_DEPS := \ -+ trusty/user/base/lib/libcore-rust/ \ -+ trusty/user/base/lib/libcompiler_builtins-rust/ \ -+ -+endif - + external/rust/crates/serde \ +- external/rust/crates/sval \ +- external/rust/crates/value-bag \ + include make/library.mk @@ -1,4 +1,4 @@ -# This file is generated by cargo2rulesmk.py --run --config cargo2rulesmk.json. +# This file is generated by cargo2rulesmk.py --run --config cargo2rulesmk.json --features . # Do not modify this file as changes will be overridden on upgrade. LOCAL_DIR := $(GET_LOCAL_DIR) @@ -16,15 +16,4 @@ MODULE_LIBRARY_DEPS := \ external/rust/crates/cfg-if \ external/rust/crates/serde \ -ifeq ($(call TOBOOL,$(TRUSTY_USERSPACE)),false) - -# avoid cyclic dependence by adding dependencies manually -MODULE_ADD_IMPLICIT_DEPS := false - -MODULE_DEPS := \ - trusty/user/base/lib/libcore-rust/ \ - trusty/user/base/lib/libcompiler_builtins-rust/ \ - -endif - include make/library.mk |