[automerger skipped] DO NOT MERGE ANYWHERE Revert "Temporarily delete build files to avoid build break" am: beef2f8189 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/gdbstub_arch/+/16176128
Change-Id: I40afc2b24da0fdadc8f374aecafa55ee2ab264aa
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 5653d83..66f2471 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
{
"git": {
- "sha1": "90aad2e136d15d486324f1985a398c02da982cdb"
+ "sha1": "4e14680234812020427385521d7d6cad585c4905"
}
}
diff --git a/Android.bp b/Android.bp
index ce311f6..558e5e8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
// This file is generated by cargo2android.py --device --run --tests.
// Do not modify this file as changes will be overridden on upgrade.
-
-
package {
default_applicable_licenses: ["external_rust_crates_gdbstub_arch_license"],
}
@@ -21,9 +19,11 @@
}
rust_defaults {
- name: "gdbstub_arch_defaults",
+ name: "gdbstub_arch_test_defaults",
crate_name: "gdbstub_arch",
srcs: ["src/lib.rs"],
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.1.1",
test_suites: ["general-tests"],
auto_gen_config: true,
edition: "2018",
@@ -35,7 +35,7 @@
rust_test_host {
name: "gdbstub_arch_host_test_src_lib",
- defaults: ["gdbstub_arch_defaults"],
+ defaults: ["gdbstub_arch_test_defaults"],
test_options: {
unit_test: true,
},
@@ -43,13 +43,15 @@
rust_test {
name: "gdbstub_arch_device_test_src_lib",
- defaults: ["gdbstub_arch_defaults"],
+ defaults: ["gdbstub_arch_test_defaults"],
}
rust_library {
name: "libgdbstub_arch",
host_supported: true,
crate_name: "gdbstub_arch",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.1.1",
srcs: ["src/lib.rs"],
edition: "2018",
rustlibs: [
diff --git a/Cargo.toml b/Cargo.toml
index f2e6592..7190872 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@
[package]
edition = "2018"
name = "gdbstub_arch"
-version = "0.1.0"
+version = "0.1.1"
authors = ["Daniel Prilik <[email protected]>"]
description = "Implementations of `gdbstub::arch::Arch` for various architectures."
homepage = "https://github.com/daniel5151/gdbstub"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index d4b7ddb..b518f6c 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -2,7 +2,7 @@
name = "gdbstub_arch"
description = "Implementations of `gdbstub::arch::Arch` for various architectures."
authors = ["Daniel Prilik <[email protected]>"]
-version = "0.1.0"
+version = "0.1.1"
license = "MIT"
edition = "2018"
readme = "README.md"
diff --git a/LICENSE b/LICENSE
index 148020e..62c6168 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
MIT License
-Copyright (c) 2020 Daniel Prilik
+Copyright (c) 2021 Daniel Prilik
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/METADATA b/METADATA
index 1528400..46123e2 100644
--- a/METADATA
+++ b/METADATA
@@ -1,7 +1,5 @@
name: "gdbstub_arch"
-description:
- "Implementations of `gdbstub::arch::Arch` for various architectures."
-
+description: "Implementations of `gdbstub::arch::Arch` for various architectures."
third_party {
url {
type: HOMEPAGE
@@ -9,9 +7,13 @@
}
url {
type: ARCHIVE
- value: "https://static.crates.io/crates/gdbstub_arch/gdbstub_arch-0.1.0.crate"
+ value: "https://static.crates.io/crates/gdbstub_arch/gdbstub_arch-0.1.1.crate"
}
- version: "0.1.0"
- last_upgrade_date { year: 2021 month: 6 day: 22 }
+ version: "0.1.1"
license_type: NOTICE
-}
\ No newline at end of file
+ last_upgrade_date {
+ year: 2021
+ month: 9
+ day: 22
+ }
+}
