commit 05eb12df018a5ac12e1629d468451d3139b311fb
author vichang <vichang@google.com> Thu May 07 09:51:23 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 07 09:51:23 2020 +0000
tree 311eaca42086b349f2ee676284a2aca0b26bdc2b
parent 881335750e0c578fb58c0bbeda8d36aa1dc87646
parent 07e31631727376f0bf7ff617f93f332d39ae6726

Merge ""Move v8 and libpac into i18n APEX" Attempt 2" am: 07e3163172

Change-Id: I427c4a76510509f865d884811009d73163fe917f

Android.base.bp

diff --git a/Android.base.bp b/Android.base.bp
index e4a18a1..9fce168 100644
--- a/Android.base.bp
+++ b/Android.base.bp
@@ -25,6 +25,9 @@
         "src/base/utils/random-number-generator.cc",
     ],
     local_include_dirs: ["src"],
+    apex_available: [
+        "com.android.i18n",
+    ],
     target: {
         android: {
             srcs: ["src/base/debug/stack_trace_android.cc"],

Android.bp

diff --git a/Android.bp b/Android.bp
index 34c3d0e..9854fc0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -85,6 +85,9 @@
         "libicui18n_headers",
     ],
     generated_headers: ["v8_torque_file"],
+    apex_available: [
+        "com.android.i18n",
+    ],
 }
 
 cc_binary_host {
@@ -213,6 +216,9 @@
         "libv8src",
         "libv8gen",
     ],
+    apex_available: [
+        "com.android.i18n",
+    ],
     export_include_dirs: ["include"],
 }
 

Android.platform.bp

diff --git a/Android.platform.bp b/Android.platform.bp
index 3a228b1..916720d 100644
--- a/Android.platform.bp
+++ b/Android.platform.bp
@@ -19,4 +19,7 @@
         "src",
         "include",
     ],
+    apex_available: [
+        "com.android.i18n",
+    ],
 }

Android.sampler.bp

diff --git a/Android.sampler.bp b/Android.sampler.bp
index 081744e..5a6a0aa 100644
--- a/Android.sampler.bp
+++ b/Android.sampler.bp
@@ -8,4 +8,7 @@
         "src",
         "include",
     ],
+    apex_available: [
+        "com.android.i18n",
+    ],
 }

Android.v8.bp

diff --git a/Android.v8.bp b/Android.v8.bp
index 8185469..81f82af 100644
--- a/Android.v8.bp
+++ b/Android.v8.bp
@@ -604,6 +604,9 @@
             cflags: ["-DANDROID_LINK_SHARED_ICU4C"],
         },
     },
+    apex_available: [
+        "com.android.i18n",
+    ],
     local_include_dirs: ["src"],
     header_libs: [
         "libicuuc_headers",

genmakefiles.py

diff --git a/genmakefiles.py b/genmakefiles.py
index c4e1d95..f3812fd 100755
--- a/genmakefiles.py
+++ b/genmakefiles.py
@@ -34,6 +34,9 @@
           defaults: ["v8_defaults"],
           srcs: $srcs,
           local_include_dirs: ["src", "include"],
+          apex_available: [
+              "com.android.i18n",
+          ],
       }
     ''').substitute({'module_name': module_name, 'srcs' : _bpList(sorted(sources))}))
 
@@ -80,6 +83,9 @@
                   cflags: ["-DANDROID_LINK_SHARED_ICU4C"],
               },
           },
+          apex_available: [
+              "com.android.i18n",
+          ],
           local_include_dirs: ["src"],
           header_libs: ["libicuuc_headers", "libicui18n_headers"],
           generated_headers: ["v8_torque_file"],
@@ -126,6 +132,9 @@
           host_supported: true,
           srcs: $srcs,
           local_include_dirs: ["src"],
+          apex_available: [
+              "com.android.i18n",
+          ],
           target: {
               android: {
                   srcs: ["src/base/debug/stack_trace_android.cc"],