diff options
| -rw-r--r-- | libartbase/Android.bp | 10 | ||||
| -rw-r--r-- | libprofile/Android.bp | 9 |
2 files changed, 7 insertions, 12 deletions
diff --git a/libartbase/Android.bp b/libartbase/Android.bp index 188b6185a6..af8e3423d4 100644 --- a/libartbase/Android.bp +++ b/libartbase/Android.bp @@ -72,7 +72,7 @@ cc_defaults { // For common macros. "libbase", ], - export_shared_lib_headers: ["libbase"], + export_shared_lib_headers: ["libbase"], // ART's macros.h depends on libbase's macros.h. }, not_windows: { srcs: [ @@ -88,7 +88,7 @@ cc_defaults { // For common macros. "libbase", ], - export_shared_lib_headers: ["libbase"], + export_shared_lib_headers: ["libbase"], // ART's macros.h depends on libbase's macros.h. }, windows: { srcs: [ @@ -103,7 +103,8 @@ cc_defaults { // For common macros. "libbase", ], - export_static_lib_headers: ["libbase"], + export_static_lib_headers: ["libbase"], // ART's macros.h depends on libbase's macros.h. + cflags: ["-Wno-thread-safety"], }, darwin: { @@ -114,9 +115,6 @@ cc_defaults { cflags: ["-DBUILDING_LIBART=1"], export_include_dirs: ["."], - // ART's macros.h depends on libbase's macros.h. - // Note: runtime_options.h depends on cmdline. But we don't really want to export this - // generically. dex2oat takes care of it itself. } cc_defaults { diff --git a/libprofile/Android.bp b/libprofile/Android.bp index 1c484ac00e..c30a2b2853 100644 --- a/libprofile/Android.bp +++ b/libprofile/Android.bp @@ -39,7 +39,7 @@ cc_defaults { // ZipArchive support, the order matters here to get all symbols. "libziparchive", ], - export_shared_lib_headers: ["libbase"], + export_shared_lib_headers: ["libbase"], // ART's macros.h depends on libbase's macros.h. }, not_windows: { shared_libs: [ @@ -48,7 +48,7 @@ cc_defaults { "libz", "libbase", ], - export_shared_lib_headers: ["libbase"], + export_shared_lib_headers: ["libbase"], // ART's macros.h depends on libbase's macros.h. }, windows: { cflags: ["-Wno-thread-safety"], @@ -58,7 +58,7 @@ cc_defaults { "libz", "libbase", ], - export_static_lib_headers: ["libbase"], + export_static_lib_headers: ["libbase"], // ART's macros.h depends on libbase's macros.h. }, darwin: { enabled: true, @@ -67,9 +67,6 @@ cc_defaults { //generated_sources: ["art_libartbase_operator_srcs"], cflags: ["-DBUILDING_LIBART=1"], export_include_dirs: ["."], - // ART's macros.h depends on libbase's macros.h. - // Note: runtime_options.h depends on cmdline. But we don't really want to export this - // generically. dex2oat takes care of it itself. } cc_defaults { |