diff options
author | 2024-04-18 01:25:15 +0000 | |
---|---|---|
committer | 2024-04-18 01:25:15 +0000 | |
commit | 17b9a5b8b401c1175eb7b3d4d59882adccf8f425 (patch) | |
tree | a52361cf4e00c82dbddd869a187acb28a850aa3b /java/java.go | |
parent | e25cc5c909783750d86f6ae91b8a170fb5dfc5b1 (diff) | |
parent | 5ae65ee6e060815dc5f3c11b505a313a3c37317c (diff) |
Merge "Allow dexpreopt of source sdklib in prebuilt apex builds" into main
Diffstat (limited to 'java/java.go')
-rw-r--r-- | java/java.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go index fb35a9a0e..2834c5f0c 100644 --- a/java/java.go +++ b/java/java.go @@ -886,6 +886,12 @@ func init() { } func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) { + if disableSourceApexVariant(ctx) { + // Prebuilts are active, do not create the installation rules for the source javalib. + // Even though the source javalib is not used, we need to hide it to prevent duplicate installation rules. + // TODO (b/331665856): Implement a principled solution for this. + j.HideFromMake() + } j.provideHiddenAPIPropertyInfo(ctx) j.sdkVersion = j.SdkVersion(ctx) |