commit 66e9af6375b7790560d07f9ad7d7501230e68211
author Patrick Rohr <prohr@google.com> Tue Jan 10 15:34:32 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 10 15:34:32 2023 +0000
tree e72ca69a4a465fc89775bd6c6266002e0395b079
parent fd71f69ba40804f9b5c133a7d2804050efc51261
parent 2b3b00efa2fc4eef5294b59bde3e17d18b378788

Merge "cronet: remove apex_available:platform"

tools/gn2bp/Android.bp.swp

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: [

tools/gn2bp/gen_android_bp

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':