commit 6e44830b65de39f5d20342109f7cbc47e4624fe0
author Paul Duffin <paulduffin@google.com> Fri Mar 20 12:00:47 2020 +0000
committer Paul Duffin <paulduffin@google.com> Fri Mar 20 12:20:06 2020 +0000
tree 42372667d930c57ef3384c1c4981fb5c1591ef8b
parent c76232ef401a036a9828fd27f22163619d9c1944

Remove unnecessary vendor/recovery available from dexfile

Test: m droid
Change-Id: I040a70d390523d139b5e773640e1eab4bd3e8c5d

libdexfile/Android.bp

diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp
index 626295c..5555017 100644
--- a/libdexfile/Android.bp
+++ b/libdexfile/Android.bp
@@ -257,8 +257,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"],
@@ -361,8 +359,6 @@
     name: "libdexfile_support",
     visibility: ["//visibility:public"],
     host_supported: true,
-    vendor_available: true,
-    recovery_available: true,
     srcs: [
         "external/dex_file_supp.cc",
     ],
@@ -370,14 +366,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