commit 3e1a2659be339633032ae7312ae2b79a80915bae
author Paul Duffin <paulduffin@google.com> Fri Mar 20 12:00:47 2020 +0000
committer Martin Stjernholm <mast@google.com> Fri Apr 24 09:37:58 2020 +0000
tree 5454ccdf0c62b1de0ce1011214a054ed5e5f60f6
parent 9389c54713d8a25413068fb7605d587ba0c95c73

Remove unnecessary vendor/recovery available from dexfile

Cherry-pick of https://r.android.com/1263039.

Test: m droid
Bug: 153996928
Change-Id: I040a70d390523d139b5e773640e1eab4bd3e8c5d
Merged-In: I040a70d390523d139b5e773640e1eab4bd3e8c5d

libdexfile/Android.bp

diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp
index 6ffd6fe..01f9d12 100644
--- a/libdexfile/Android.bp
+++ b/libdexfile/Android.bp
@@ -252,8 +252,6 @@
     name: "libdexfile_external_headers",
     visibility: ["//visibility:public"],
     host_supported: true,
-    vendor_available: true,
-    recovery_available: true,
     header_libs: ["libbase_headers"],
     export_header_lib_headers: ["libbase_headers"],
     export_include_dirs: ["external/include"],
@@ -351,8 +349,6 @@
     name: "libdexfile_support",
     visibility: ["//visibility:public"],
     host_supported: true,
-    vendor_available: true,
-    recovery_available: true,
     srcs: [
         "external/dex_file_supp.cc",
     ],
@@ -360,14 +356,6 @@
     shared_libs: ["liblog"],
     header_libs: ["libdexfile_external_headers"],
     export_header_lib_headers: ["libdexfile_external_headers"],
-    target: {
-        recovery: {
-            cflags: ["-DNO_DEXFILE_SUPPORT"],
-        },
-        vendor: {
-            cflags: ["-DNO_DEXFILE_SUPPORT"],
-        },
-    },
 }
 
 // The same source file is used in two tests here, so unlike other ART gtests it