Exclude test_com.android.tethering from R snapshot

Bug: 218685706
Test: BUILD_NUMBER=fixed packages/modules/common/build/mainline_modules_sdks.sh --build-release=R
      # Run before and after making this change and verify that the
      # only difference is to remove test_com.android.tethering.
      atest --no-bazel-mode --host mainline_modules_sdks_test
Change-Id: Ic24ce4afbe9f84b1afd65dca9cee2154dc436646
This commit is contained in:
Paul Duffin
2022-10-12 13:50:23 +01:00
parent 5fc8511dff
commit 378d990a95
3 changed files with 69 additions and 2 deletions

View File

@@ -422,6 +422,11 @@ class SnapshotBuilder:
scope_pattern=r"(public|system|module-lib)",
name_pattern=fr"({module_name}(-removed|-stubs)?)"))
available_apexes = [f'"{aosp_apex}"']
if aosp_apex != "com.android.tethering":
available_apexes.append(f'"test_{aosp_apex}"')
apex_available = ",\n ".join(available_apexes)
bp.write(f"""
java_sdk_library_import {{
name: "{module_name}",
@@ -429,8 +434,7 @@ java_sdk_library_import {{
prefer: true,
shared_library: {shared_library},
apex_available: [
"{aosp_apex}",
"test_{aosp_apex}",
{apex_available},
],
public: {{
jars: ["public/{module_name}-stubs.jar"],