aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-05-17 12:58:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-05-17 12:58:32 +0000
commit36fe147ed335f8a786ea4c9e2067693ba17b506c (patch)
tree8c1eacabe1802a7153d6321cc90904c60d80b775
parent797eeadc74178c4dd3d326edb26269387d11e5b9 (diff)
parent306a907bb6e1eb164b6598e32adbb0ce05427916 (diff)
downloadv8-36fe147ed335f8a786ea4c9e2067693ba17b506c.tar.gz
Merge "Set apex_available property" into rvc-dev
-rw-r--r--Android.base.bp5
-rw-r--r--Android.bp12
-rw-r--r--Android.platform.bp5
-rw-r--r--Android.sampler.bp5
-rw-r--r--Android.v8.bp5
5 files changed, 31 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",
+ ],
}
diff --git a/Android.bp b/Android.bp
index a5859f2e..c1244234 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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 539d342e..09f14dad 100644
--- a/Android.v8.bp
+++ b/Android.v8.bp
@@ -657,4 +657,9 @@ cc_library_static {
cfi: true,
blacklist: "./tools/cfi/blacklist.txt",
},
+
+ apex_available: [
+ "com.android.art.debug",
+ "com.android.art.release",
+ ],
}