diff options
| author | Per Larsen <perlarsen@google.com> | 2023-11-09 01:15:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-09 01:15:50 +0000 |
| commit | 8e6de940b51195cb01f06e2e5e4d3e111607bb7c (patch) | |
| tree | 1c21bab94220017ec841a951375543ab731a9adc | |
| parent | df321a8893492ac3ebdae4c9e2437dc3c06b79ac (diff) | |
| parent | 847fa8e7b887e8071dd528b6e5a4088a8feff29a (diff) | |
| download | protobuf-8e6de940b51195cb01f06e2e5e4d3e111607bb7c.tar.gz | |
Adding autogenerated Trusty makefile rules am: cc124ef7e9 am: 847fa8e7b8
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/protobuf/+/2752729
Change-Id: I1428aac35abbe430e47326f8a6f9613fea6108cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | 2.27.1/rules.mk | 24 | ||||
| -rw-r--r-- | cargo2rulesmk.json | 4 | ||||
| -rw-r--r-- | patches/rules.mk.diff | 12 | ||||
| -rw-r--r-- | rules.mk | 28 |
4 files changed, 68 insertions, 0 deletions
diff --git a/2.27.1/rules.mk b/2.27.1/rules.mk new file mode 100644 index 0000000..54e557b --- /dev/null +++ b/2.27.1/rules.mk @@ -0,0 +1,24 @@ +# This file is generated by cargo2rulesmk.py --run --copy-out. +# Do not modify this file as changes will be overridden on upgrade. + +LOCAL_DIR := $(GET_LOCAL_DIR) +MODULE := $(LOCAL_DIR) +MODULE_CRATE_NAME := protobuf +MODULE_SRCS := \ + $(LOCAL_DIR)/src/lib.rs \ + +OUT_FILE := $(call TOBUILDDIR,$(MODULE))/version.rs +$(OUT_FILE): $(MODULE)/out/version.rs + @echo copying $< to $@ + @$(MKDIR) + cp $< $@ + +MODULE_RUST_ENV += OUT_DIR=$(dir $(OUT_FILE)) + +MODULE_SRCDEPS := $(OUT_FILE) +MODULE_RUST_EDITION := 2018 +MODULE_LIBRARY_DEPS := \ + external/rust/crates/serde \ + external/rust/crates/serde_derive \ + +include make/library.mk diff --git a/cargo2rulesmk.json b/cargo2rulesmk.json new file mode 100644 index 0000000..0b48ef5 --- /dev/null +++ b/cargo2rulesmk.json @@ -0,0 +1,4 @@ +{ + "copy-out": true, + "patch": "patches/rules.mk.diff" +} diff --git a/patches/rules.mk.diff b/patches/rules.mk.diff new file mode 100644 index 0000000..eb77553 --- /dev/null +++ b/patches/rules.mk.diff @@ -0,0 +1,12 @@ +diff --git b/rules.mk a/rules.mk +index 81f63ed..69b7784 100644 +--- b/rules.mk ++++ a/rules.mk +@@ -21,7 +21,6 @@ MODULE_RUSTFLAGS += \ + --cfg 'feature="default"' \ + + MODULE_LIBRARY_DEPS := \ +- external/rust/crates/bytes \ + external/rust/crates/once_cell \ + external/rust/crates/protobuf-support \ + external/rust/crates/thiserror \ diff --git a/rules.mk b/rules.mk new file mode 100644 index 0000000..69b7784 --- /dev/null +++ b/rules.mk @@ -0,0 +1,28 @@ +# This file is generated by cargo2rulesmk.py --run --config cargo2rulesmk.json. +# Do not modify this file as changes will be overridden on upgrade. + +LOCAL_DIR := $(GET_LOCAL_DIR) +MODULE := $(LOCAL_DIR) +MODULE_CRATE_NAME := protobuf +MODULE_SRCS := \ + $(LOCAL_DIR)/src/lib.rs \ + +OUT_FILE := $(call TOBUILDDIR,$(MODULE))/version.rs +$(OUT_FILE): $(MODULE)/out/version.rs + @echo copying $< to $@ + @$(MKDIR) + cp $< $@ + +MODULE_RUST_ENV += OUT_DIR=$(dir $(OUT_FILE)) + +MODULE_SRCDEPS := $(OUT_FILE) +MODULE_RUST_EDITION := 2021 +MODULE_RUSTFLAGS += \ + --cfg 'feature="default"' \ + +MODULE_LIBRARY_DEPS := \ + external/rust/crates/once_cell \ + external/rust/crates/protobuf-support \ + external/rust/crates/thiserror \ + +include make/library.mk |