diff options
| -rw-r--r-- | Android.base.bp | 5 | ||||
| -rw-r--r-- | Android.bp | 12 | ||||
| -rw-r--r-- | Android.platform.bp | 5 | ||||
| -rw-r--r-- | Android.sampler.bp | 5 | ||||
| -rw-r--r-- | Android.v8.bp | 9 | ||||
| -rw-r--r-- | tools/cfi/blacklist.txt | 3 |
6 files changed, 38 insertions, 1 deletions
diff --git a/Android.base.bp b/Android.base.bp index e4a18a14..df62d0a1 100644 --- a/Android.base.bp +++ b/Android.base.bp @@ -40,4 +40,9 @@ cc_library_static { srcs: ["src/base/platform/platform-macos.cc"], }, }, + + apex_available: [ + "com.android.art.debug", + "com.android.art.release", + ], } @@ -101,6 +101,11 @@ cc_library_static { "libicui18n_headers", ], generated_headers: ["v8_torque_file"], + + apex_available: [ + "com.android.art.debug", + "com.android.art.release", + ], } cc_binary_host { @@ -230,6 +235,11 @@ cc_library_static { "libv8gen", ], export_include_dirs: ["include"], + + apex_available: [ + "com.android.art.debug", + "com.android.art.release", + ], } // The bare 'd8' name conflicts with d8 from prebuilts/r8 @@ -276,4 +286,4 @@ genrule { ], out: ["d8-js.cc"], } -*/
\ No newline at end of file +*/ diff --git a/Android.platform.bp b/Android.platform.bp index 3a228b19..826ef438 100644 --- a/Android.platform.bp +++ b/Android.platform.bp @@ -19,4 +19,9 @@ cc_library_static { "src", "include", ], + + apex_available: [ + "com.android.art.debug", + "com.android.art.release", + ], } diff --git a/Android.sampler.bp b/Android.sampler.bp index 081744e4..b6a3f35b 100644 --- a/Android.sampler.bp +++ b/Android.sampler.bp @@ -8,4 +8,9 @@ cc_library_static { "src", "include", ], + + apex_available: [ + "com.android.art.debug", + "com.android.art.release", + ], } diff --git a/Android.v8.bp b/Android.v8.bp index 8df8e6c3..09f14dad 100644 --- a/Android.v8.bp +++ b/Android.v8.bp @@ -653,4 +653,13 @@ cc_library_static { ], generated_headers: ["v8_torque_file"], generated_sources: ["v8_torque_file_cc"], + sanitize: { + cfi: true, + blacklist: "./tools/cfi/blacklist.txt", + }, + + apex_available: [ + "com.android.art.debug", + "com.android.art.release", + ], } diff --git a/tools/cfi/blacklist.txt b/tools/cfi/blacklist.txt index c1571b8c..822f83f1 100644 --- a/tools/cfi/blacklist.txt +++ b/tools/cfi/blacklist.txt @@ -24,3 +24,6 @@ fun:*PendingPhantomCallback*Invoke* fun:*GlobalHandles*PostGarbageCollectionProcessing* fun:*InvokeAccessorGetterCallback* + +# check for type failed during indirect function call +fun:*MemMove* |