diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-04-28 21:52:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 21:52:36 +0000 |
| commit | f7390452d877fbb893d2350934a294ede98df5df (patch) | |
| tree | 9a0d8f711d29ef10cada1eca97bdda6252989cd9 /patches/Android.bp.patch | |
| parent | 82305a2c8d1fe3cdb04cb56a73fc378a321106b0 (diff) | |
| parent | afce7ce1a75e1a959cd9a8ebfff223af6ef77231 (diff) | |
| download | untrusted-f7390452d877fbb893d2350934a294ede98df5df.tar.gz | |
Merge "Generate apex_available from c2a instead of a patch" am: 3f3463b5ea am: afce7ce1a7
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/untrusted/+/1690065
Change-Id: I9b278a06f5560248057548e90284d0b9ae787228
Diffstat (limited to 'patches/Android.bp.patch')
| -rw-r--r-- | patches/Android.bp.patch | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch deleted file mode 100644 index 90cc841..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 52ab13d..eaf9020 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -6,6 +6,11 @@ rust_library { - crate_name: "untrusted", - srcs: ["src/untrusted.rs"], - edition: "2018", -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.resolv", -+ ], -+ min_sdk_version: "29", - } - - rust_defaults { |