gn2bp: Add apex_available to cronet_aml_java am: 42acf6d47a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2337167
Change-Id: I5604712c8439b94aac8709e69179ab4c60a44ff2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index 4941d40..bbd0017 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -9848,6 +9848,10 @@
"net/android/java/src/org/chromium/net/X509Util.java",
"url/android/java/src/org/chromium/url/IDNStringUtil.java",
],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.tethering",
+ ],
libs: [
"android-support-multidex",
"androidx.annotation_annotation",
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 55f8339..b5d47d7 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -1352,6 +1352,9 @@
module.aidl["include_dirs"] = {"frameworks/base/core/java/"}
module.aidl["local_include_dirs"] = {"base/android/java/src/"}
module.sdk_version = "module_current"
+ module.apex_available.add(tethering_apex)
+ # TODO: remove following workaround required to make this module visible to make (b/203203405)
+ module.apex_available.add("//apex_available:platform")
for dep in gn.java_actions:
target = gn.get_target(dep)
if target.script == '//build/android/gyp/gcc_preprocess.py':