diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-04-15 07:38:32 -0700 |
|---|---|---|
| committer | Joel Galenson <jgalenson@google.com> | 2021-04-15 07:38:32 -0700 |
| commit | 5087ec31804fdd2629ef5d9ab26043dafda2a9b8 (patch) | |
| tree | a431d2fb0d4bb528bea00f95dc43e94a56a52bec /patches | |
| parent | 5068367b2dbbbbad6b162ef63c44e54d15875c61 (diff) | |
| download | libc-5087ec31804fdd2629ef5d9ab26043dafda2a9b8.tar.gz | |
Fix some things
Remove a test that doesn't exist.
Fix the patch file so it applies correctly.
We also update to the new Android.bp cfg syntax while we're at it.
Fixes: 185447793
Test: Build
Test: Run cargo2android.
Change-Id: Idde01ab27378bb0bd3b806972f0232ce9ae778fd
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/Android.bp.patch | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch index 3acc4a15..59e2418f 100644 --- a/patches/Android.bp.patch +++ b/patches/Android.bp.patch @@ -1,10 +1,8 @@ --- Android.bp 2020-12-14 23:34:21.725521979 +0900 +++ Android.bp.new 2020-12-14 23:30:18.808503638 +0900 - rust_defaults { - name: "rust_libc_defaults", -@@ -92,4 +92,10 @@ rust_library { - "--cfg libc_priv_mod_use", - "--cfg libc_union", +@@ -135,4 +135,10 @@ rust_library { + "libc_priv_mod_use", + "libc_union", ], + apex_available: [ + "//apex_available:platform", |