Merge "cronet: remove apex_available:platform" am: 66e9af6375
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2381733
Change-Id: I78c0e4411b6e5b3fad6830c804855e8d541c0251
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 bc863db..f96d39f 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -4403,7 +4403,6 @@
"modules-utils-build_system",
],
apex_available: [
- "//apex_available:platform",
"com.android.tethering",
],
libs: [
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 09c7db0..f4520e8 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -1537,8 +1537,6 @@
# would be less likely to conflict with upstream changes if the revert is not
# accepted.
module.javacflags.add("-Aorg.chromium.chrome.skipGenJni")
- # TODO: remove following workaround required to make this module visible to make (b/203203405)
- module.apex_available.add("//apex_available:platform")
for dep in get_non_api_java_actions(gn):
target = gn.get_target(dep)
if target.script == '//build/android/gyp/gcc_preprocess.py':