diff options
| author | 2025-02-11 11:40:13 -0800 | |
|---|---|---|
| committer | 2025-02-11 11:40:13 -0800 | |
| commit | 1dc3511441bae21a32481a22ef7ce8f61a7a2388 (patch) | |
| tree | 4ef8d45c9ba3ab91eff15d5b8e4840b093dc017e /java/java.go | |
| parent | 434953e9547aaa6d21c7a124a89f9a3695a9fc4d (diff) | |
| parent | 6db3e6ffd9b89424d1c78917f80bfaf071c41902 (diff) | |
Merge changes from topics "apex_transition_info", "bcp_dependency_through_apex" into main am: 5c846d8349 am: 6db3e6ffd9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3470502
Change-Id: I9557fe50d5bdae792487fbc06e64c4b9473c65a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go index c1ce880d6..846e32237 100644 --- a/java/java.go +++ b/java/java.go @@ -3546,7 +3546,6 @@ func DexImportFactory() android.Module { type Defaults struct { android.ModuleBase android.DefaultsModuleBase - android.ApexModuleBase } // java_defaults provides a set of properties that can be inherited by other java or android modules. |