commit b916cac183bfe343b0ee78b805007c71f6752474
author Jiyong Park <jiyong@google.com> Thu Dec 19 02:12:09 2019 +0000
committer Jiyong Park <jiyong@google.com> Thu Dec 19 12:36:38 2019 +0900
tree c7e5d92783018151aa302f93ea333da8cfd8f5f4
parent cd24607ac7deabf92076e74ec67c8e850ef97554

Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMAR

Reason for revert: relanding with fix
Reverted Changes:
Ic4119368c:Revert submission 1191937-art_apex_available
Ia084976bb:Revert submission 1191937-art_apex_available
Iada86226d:Revert submission 1191937-art_apex_available
Ic76735eac:Revert submission 1191937-art_apex_available
I1eb30e355:Revert submission 1191937-art_apex_available
Icaf95d260:Revert submission 1191937-art_apex_available
Ie8bace4be:Revert submission 1191937-art_apex_available
I8961702cf:Revert submission 1191937-art_apex_available
I39316f9ef:Revert submission 1191937-art_apex_available
I522a7e83b:Revert submission 1191937-art_apex_available
I8b9424976:Revert submission 1191937-art_apex_available
I48b998629:Revert submission 1191937-art_apex_available

Change-Id: Id409b14e0fcb26fe943ad057a0e8d5d127e5cde9

NativeCode.bp

diff --git a/NativeCode.bp b/NativeCode.bp
index ef2f554..25c128b 100644
--- a/NativeCode.bp
+++ b/NativeCode.bp
@@ -50,6 +50,10 @@
     visibility: [
         "//art/build/apex",
     ],
+    apex_available: [
+        "com.android.art.release",
+        "com.android.art.debug",
+    ],
     defaults: [
         "core_native_default_flags",
         "core_native_default_libs",
@@ -90,6 +94,10 @@
         "//art/build/apex",
         "//external/conscrypt",
     ],
+    apex_available: [
+        "com.android.art.release",
+        "com.android.art.debug",
+    ],
     defaults: [
         "core_native_default_flags",
     ],
@@ -165,6 +173,10 @@
     visibility: [
         "//art/build/apex",
     ],
+    apex_available: [
+        "com.android.art.release",
+        "com.android.art.debug",
+    ],
     defaults: ["libopenjdk_native_defaults"],
     shared_libs: [
         "libopenjdkjvm",
@@ -177,6 +189,9 @@
     visibility: [
         "//art/build/apex",
     ],
+    apex_available: [
+        "com.android.art.debug",
+    ],
     defaults: ["libopenjdk_native_defaults"],
     shared_libs: [
         "libopenjdkjvmd",