Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Java: remove stubs/android directory #10580

Merged
merged 1 commit into from
Sep 28, 2022
Merged

Conversation

jcogs33
Copy link
Contributor

@jcogs33 jcogs33 commented Sep 27, 2022

Summary:
This PR removes the old stubs/android directory and replaces anywhere it is used with stubs/google-android-9.0.0 instead.

Description:

  • Searched for usages of stubs/android and found that it was only used in two options files. Updated these files to use stubs/google-android-9.0.0 instead.
  • Ran the tests related to these options files to confirm that they still work when using stubs/google-android-9.0.0. Since they worked after the switch, there did not appear to be any need to generate additional stubs in stubs/google-android-9.0.0 for them.
  • Deleted the stubs/android directory.

Consideration:

  • I noticed that a com/android/internal/R.java file existed in stubs/android but not in stubs/google-android-9.0.0. I did not move this file to stubs/google-android-9.0.0 since it does not seem that any tests are dependent on it (based on the Java Language Tests check passing without it). Let me know if this file should be moved to stubs/google-android-9.0.0 instead of being removed.
  • Let me know if there is anything else that needs to be updated/considered when removing this directory.

@github-actions github-actions bot added the Java label Sep 27, 2022
@jcogs33 jcogs33 marked this pull request as ready for review September 27, 2022 20:23
@jcogs33 jcogs33 requested a review from a team as a code owner September 27, 2022 20:23
Copy link
Contributor

@atorralba atorralba left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is great, thank you! The R.java file is auto-generated in real Android applications, so it makes sense we don't need it in our tests.

@jcogs33 jcogs33 merged commit b448206 into github:main Sep 28, 2022
@jcogs33 jcogs33 deleted the remove-stubs-android branch September 28, 2022 11:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants