diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-27 14:09:43 -0700 |
---|---|---|
committer | Joel Galenson <jgalenson@google.com> | 2021-04-27 14:10:07 -0700 |
commit | 47baee401f72d400feb63fe1fa892c1f74fcfe67 (patch) | |
tree | d085eaf52ac4c533290ddfff287cc1632b2bd74f /patches/Android.bp.diff | |
parent | d8a736d575cc23ac823656988229e89e143ec2a0 (diff) | |
download | lazy_static-47baee401f72d400feb63fe1fa892c1f74fcfe67.tar.gz |
Generate apex_available from c2a instead of a patch
Test: Run c2a
Test: Build
Change-Id: Id768b1ae1985a219c460cf5e1ef0dddc6f53c338
Diffstat (limited to 'patches/Android.bp.diff')
-rw-r--r-- | patches/Android.bp.diff | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff index 213237d..e07e725 100644 --- a/patches/Android.bp.diff +++ b/patches/Android.bp.diff @@ -2,7 +2,22 @@ diff --git a/Android.bp b/Android.bp index 5033c27..843fa1c 100644 --- a/Android.bp +++ b/Android.bp -@@ -71,23 +71,6 @@ rust_defaults { +@@ -45,9 +45,6 @@ + test_suites: ["general-tests"], + auto_gen_config: true, + edition: "2015", +- rustlibs: [ +- "libdoc_comment", +- ], + } + + rust_test_host { +@@ -70,28 +67,10 @@ + auto_gen_config: true, + edition: "2015", + rustlibs: [ +- "libdoc_comment", + "liblazy_static", ], } @@ -26,14 +41,3 @@ index 5033c27..843fa1c 100644 rust_test_host { name: "lazy_static_host_test_tests_test", defaults: ["lazy_static_defaults_lazy_static"], -@@ -112,4 +95,9 @@ rust_library { - crate_name: "lazy_static", - srcs: ["src/lib.rs"], - edition: "2015", -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.resolv", -+ "com.android.virt", -+ ], -+ min_sdk_version: "29", - } |