diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-04-28 22:10:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 22:10:41 +0000 |
| commit | 79401926776fe75253e92c83c8ebc92a99e248d9 (patch) | |
| tree | 9a0d8f711d29ef10cada1eca97bdda6252989cd9 /patches/Android.bp.patch | |
| parent | cd15ec95a78610ef5003fd43d9cef6007a4ef2ef (diff) | |
| parent | f7390452d877fbb893d2350934a294ede98df5df (diff) | |
| download | untrusted-79401926776fe75253e92c83c8ebc92a99e248d9.tar.gz | |
Merge "Generate apex_available from c2a instead of a patch" am: 3f3463b5ea am: afce7ce1a7 am: f7390452d8android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/untrusted/+/1690065
Change-Id: I38e2bbf9f65334a5a368284f0861887dc9db2b41
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 { |