diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-11-21 21:21:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-21 21:21:42 +0000 |
| commit | 0d65130637a8491800819b87d8e2fa0d94bfd31c (patch) | |
| tree | d843188c5f1a875decf2c48b583bccd9d3ae789c | |
| parent | c96077c8f4d04f58f9f3eb22fe589f3abe080c92 (diff) | |
| parent | ec225f7e0bbacd0df6f1dbbe5ecc7d2345ad0e45 (diff) | |
| download | openssl-0d65130637a8491800819b87d8e2fa0d94bfd31c.tar.gz | |
Don't run cargo build for cargo_embargo. am: 285b521de5 am: 8597eafc05 am: ec225f7e0b
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/openssl/+/2841375
Change-Id: Iabf974568bacc70fc3a9c86bcfc41a5ce22b05ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | README.android | 30 | ||||
| -rw-r--r-- | cargo_embargo.json | 3 |
2 files changed, 4 insertions, 29 deletions
diff --git a/README.android b/README.android index 0c28f17..d4f6465 100644 --- a/README.android +++ b/README.android @@ -1,33 +1,7 @@ ## Steps for updating this crate -1. In order to run cargo2android, for this crate, the BoringSSL rust bindings first needs to be - built. Copy `googletest` to `boringssl`, which is needed to build the rust bindings - - ``` - $ cp -r external/googletest external/boringssl/src/third_party/ - ``` -2. Build the rust bindings (More information at - https://boringssl.googlesource.com/boringssl/+/HEAD/BUILDING.md) - - ``` - $ cd external/boringssl/src - $ cmake -DRUST_BINDINGS=x86_64-unknown-linux-gnu -B build - $ make -C build - ``` -3. Run `tools/external_updater/updater.sh update rust/crates/openssl`. Cargo errors causing the - command to fail are expected (since the boringSSL crate is outside of the `openssl` directory, - redshell is not able to access it). -4. The repository should now be in a `tmp_auto_upgrade` branch, and the Android.bp will contain - some error message. -5. Run cargo_embargo - - ``` - $ cargo_embargo run cargo_embargo.json - ``` -6. Clean up the changes in external/boringssl repository, and double check that the resulting - Android.bp builds correctly by running `m libopenssl`. -7. Commit the changes and upload the CL. -8. `external/rust/crates/openssl-macros` should also be updated at the same time. +1. Run `tools/external_updater/updater.sh update rust/crates/openssl`. +2. `external/rust/crates/openssl-macros` should also be updated at the same time. ## Generating patch files diff --git a/cargo_embargo.json b/cargo_embargo.json index 8b5e8b0..16df1d0 100644 --- a/cargo_embargo.json +++ b/cargo_embargo.json @@ -3,7 +3,7 @@ "//apex_available:platform", "com.android.virt" ], - "extra_cfg": ["soong"], + "extra_cfg": ["boringssl", "soong"], "features": [ "unstable_boringssl" ], @@ -12,6 +12,7 @@ "patch": "patches/Android.bp.diff" } }, + "run_cargo": false, "variants": [ { "module_name_overrides": { |