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.

Sign up for GitHub

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

docs: add readme on the plugin and AOSP relation #7262

Merged
merged 3 commits into from
Feb 1, 2025
Merged

docs: add readme on the plugin and AOSP relation #7262

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
972864b
docs: add readme on the plugin and AOSP relation
ujohnny Jan 30, 2025
334478c
docs: move note from aosp.md to README.md
ujohnny Jan 31, 2025
079a412
docs: add link to the spreadsheet
ujohnny Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions docs/aosp.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# ASwB as a Part of AOSP and This Repo

For a long time, the Android Studio plugin was built from the
[google branch](https://github.com/bazelbuild/intellij/tree/google), and the
[master branch](https://github.com/bazelbuild/intellij/tree/master) was receiving updates from the former as cherry-picks. After the migration of the Android Studio plugin to
[AOSP](https://android.googlesource.com/platform/tools/adt/idea/+/refs/heads/mirror-goog-studio-main/aswb/),
this process was interrupted for approximately five months.

In November 2024, many changes from AOSP were cherry-picked in
[6965](https://github.com/bazelbuild/intellij/pull/6965).
Starting from that point, we have been making our
best effort to apply AOSP changes to the
[master branch](https://github.com/bazelbuild/intellij/tree/master).

For this purpose, we use the Python tool
[LeFrosch/intellij-aosp-merge](https://github.com/LeFrosch/intellij-aosp-merge),
which is capable of adjusting paths from AOSP to this project's
layout and allows us to compare revisions in AOSP and here.