Partially disable building ART for host on Mac.
Building ART for host on Mac is not currently needed.
Building ART for target on Mac still works.
The main motivation is remove the custom elf.h from the code base.
Bug: 73344075
Test: "m -j40" on Mac.
Change-Id: I4b6f7aa7b291dcb6d751374ecf8d15f35877bd2e
diff --git a/build/Android.bp b/build/Android.bp
index 46fb0c5..e4fb99f 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -147,6 +147,9 @@
"-Wmissing-noreturn",
],
},
+ darwin: {
+ enabled: false,
+ },
host: {
cflags: [
// Bug: 15446488. We don't omit the frame pointer to work around
diff --git a/dalvikvm/Android.bp b/dalvikvm/Android.bp
index c1944fb..0688318 100644
--- a/dalvikvm/Android.bp
+++ b/dalvikvm/Android.bp
@@ -38,6 +38,9 @@
linux: {
ldflags: ["-Wl,--export-dynamic"],
},
+ darwin: {
+ enabled: false,
+ },
},
multilib: {
diff --git a/libartbase/Android.bp b/libartbase/Android.bp
index 1ca7011..d4fe7b3 100644
--- a/libartbase/Android.bp
+++ b/libartbase/Android.bp
@@ -106,6 +106,9 @@
export_static_lib_headers: ["libbase"],
cflags: ["-Wno-thread-safety"],
},
+ darwin: {
+ enabled: true, // for libdexfile.
+ },
},
generated_sources: ["art_libartbase_operator_srcs"],
cflags: ["-DBUILDING_LIBART=1"],
diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp
index 0a66557..30d1bcd 100644
--- a/libdexfile/Android.bp
+++ b/libdexfile/Android.bp
@@ -90,6 +90,9 @@
],
cflags: ["-Wno-thread-safety"],
},
+ darwin: {
+ enabled: true,
+ },
},
generated_sources: ["dexfile_operator_srcs"],
export_include_dirs: ["."],
diff --git a/libprofile/Android.bp b/libprofile/Android.bp
index 986adce..78bc9d3 100644
--- a/libprofile/Android.bp
+++ b/libprofile/Android.bp
@@ -59,6 +59,9 @@
],
export_static_lib_headers: ["libbase"],
},
+ darwin: {
+ enabled: true,
+ },
},
//generated_sources: ["art_libartbase_operator_srcs"],
cflags: ["-DBUILDING_LIBART=1"],
diff --git a/profman/Android.bp b/profman/Android.bp
index 33cca02..bcefffd 100644
--- a/profman/Android.bp
+++ b/profman/Android.bp
@@ -29,6 +29,9 @@
// Use the 32-bit version of profman on devices.
compile_multilib: "prefer32",
},
+ darwin: {
+ enabled: true,
+ },
},
shared_libs: [
diff --git a/tools/hiddenapi/Android.bp b/tools/hiddenapi/Android.bp
index 3b364b6..e77e4c78 100644
--- a/tools/hiddenapi/Android.bp
+++ b/tools/hiddenapi/Android.bp
@@ -27,6 +27,9 @@
android: {
compile_multilib: "prefer32",
},
+ darwin: {
+ enabled: true,
+ },
},
shared_libs: [
@@ -38,7 +41,6 @@
name: "hiddenapi",
defaults: ["hiddenapi-defaults"],
shared_libs: [
- "libart",
"libdexfile",
"libartbase",
],
@@ -51,7 +53,6 @@
"hiddenapi-defaults",
],
shared_libs: [
- "libartd",
"libdexfiled",
"libartbased",
],
