diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/droidstubs.go | 8 | ||||
| -rw-r--r-- | java/droidstubs_test.go | 42 |
2 files changed, 25 insertions, 25 deletions
diff --git a/java/droidstubs.go b/java/droidstubs.go index e955949af..fa1fb8649 100644 --- a/java/droidstubs.go +++ b/java/droidstubs.go @@ -629,8 +629,8 @@ func (d *Droidstubs) apiLevelsGenerationFlags(ctx android.ModuleContext, cmd *an cmd.Implicit(dep) } else if filename != "android.jar" && depBase == "android.jar" { // Metalava implicitly searches these patterns: - // prebuilts/tools/common/api-versions/android-%/android.jar - // prebuilts/sdk/%/public/android.jar + // prebuilts/tools/common/api-versions/android-{version:level}/android.jar + // prebuilts/sdk/{version:level}/public/android.jar // Add android.jar files from the api_levels_annotations_dirs directories to try // to satisfy these patterns. If Metalava can't find a match for an API level // between 1 and 28 in at least one pattern it will fail. @@ -646,11 +646,11 @@ func (d *Droidstubs) apiLevelsGenerationFlags(ctx android.ModuleContext, cmd *an }) // Generate the list of --android-jar-pattern options. The order matters so the first one which - // matches will be the one that is used for a specific api level.. + // matches will be the one that is used for a specific api level. for _, sdkDir := range sdkDirs { for _, dir := range dirs { addPattern := func(jarFilename string) { - cmd.FlagWithArg("--android-jar-pattern ", fmt.Sprintf("%s/%%/%s/%s", dir, sdkDir, jarFilename)) + cmd.FlagWithArg("--android-jar-pattern ", fmt.Sprintf("%s/{version:level}/%s/%s", dir, sdkDir, jarFilename)) } if sdkDir == "module-lib" || sdkDir == "system-server" { diff --git a/java/droidstubs_test.go b/java/droidstubs_test.go index 1e8362cf2..37740ae43 100644 --- a/java/droidstubs_test.go +++ b/java/droidstubs_test.go @@ -88,7 +88,7 @@ func TestDroidstubs(t *testing.T) { cmdline := String(sboxProto.Commands[0].Command) android.AssertStringContainsEquals(t, "api-versions generation flag", cmdline, "--generate-api-levels", c.generate_xml) if c.expectedJarFilename != "" { - expected := "--android-jar-pattern ./%/public/" + c.expectedJarFilename + expected := "--android-jar-pattern ./{version:level}/public/" + c.expectedJarFilename if !strings.Contains(cmdline, expected) { t.Errorf("For %q, expected metalava argument %q, but was not found %q", c.moduleName, expected, cmdline) } @@ -142,8 +142,8 @@ func TestPublicDroidstubs(t *testing.T) { patterns := getAndroidJarPatternsForDroidstubs(t, "public") android.AssertArrayString(t, "order of patterns", []string{ - "--android-jar-pattern somedir/%/public/android.jar", - "--android-jar-pattern someotherdir/%/public/android.jar", + "--android-jar-pattern somedir/{version:level}/public/android.jar", + "--android-jar-pattern someotherdir/{version:level}/public/android.jar", }, patterns) } @@ -151,10 +151,10 @@ func TestSystemDroidstubs(t *testing.T) { patterns := getAndroidJarPatternsForDroidstubs(t, "system") android.AssertArrayString(t, "order of patterns", []string{ - "--android-jar-pattern somedir/%/system/android.jar", - "--android-jar-pattern someotherdir/%/system/android.jar", - "--android-jar-pattern somedir/%/public/android.jar", - "--android-jar-pattern someotherdir/%/public/android.jar", + "--android-jar-pattern somedir/{version:level}/system/android.jar", + "--android-jar-pattern someotherdir/{version:level}/system/android.jar", + "--android-jar-pattern somedir/{version:level}/public/android.jar", + "--android-jar-pattern someotherdir/{version:level}/public/android.jar", }, patterns) } @@ -162,12 +162,12 @@ func TestModuleLibDroidstubs(t *testing.T) { patterns := getAndroidJarPatternsForDroidstubs(t, "module-lib") android.AssertArrayString(t, "order of patterns", []string{ - "--android-jar-pattern somedir/%/module-lib/android.jar", - "--android-jar-pattern someotherdir/%/module-lib/android.jar", - "--android-jar-pattern somedir/%/system/android.jar", - "--android-jar-pattern someotherdir/%/system/android.jar", - "--android-jar-pattern somedir/%/public/android.jar", - "--android-jar-pattern someotherdir/%/public/android.jar", + "--android-jar-pattern somedir/{version:level}/module-lib/android.jar", + "--android-jar-pattern someotherdir/{version:level}/module-lib/android.jar", + "--android-jar-pattern somedir/{version:level}/system/android.jar", + "--android-jar-pattern someotherdir/{version:level}/system/android.jar", + "--android-jar-pattern somedir/{version:level}/public/android.jar", + "--android-jar-pattern someotherdir/{version:level}/public/android.jar", }, patterns) } @@ -175,14 +175,14 @@ func TestSystemServerDroidstubs(t *testing.T) { patterns := getAndroidJarPatternsForDroidstubs(t, "system-server") android.AssertArrayString(t, "order of patterns", []string{ - "--android-jar-pattern somedir/%/system-server/android.jar", - "--android-jar-pattern someotherdir/%/system-server/android.jar", - "--android-jar-pattern somedir/%/module-lib/android.jar", - "--android-jar-pattern someotherdir/%/module-lib/android.jar", - "--android-jar-pattern somedir/%/system/android.jar", - "--android-jar-pattern someotherdir/%/system/android.jar", - "--android-jar-pattern somedir/%/public/android.jar", - "--android-jar-pattern someotherdir/%/public/android.jar", + "--android-jar-pattern somedir/{version:level}/system-server/android.jar", + "--android-jar-pattern someotherdir/{version:level}/system-server/android.jar", + "--android-jar-pattern somedir/{version:level}/module-lib/android.jar", + "--android-jar-pattern someotherdir/{version:level}/module-lib/android.jar", + "--android-jar-pattern somedir/{version:level}/system/android.jar", + "--android-jar-pattern someotherdir/{version:level}/system/android.jar", + "--android-jar-pattern somedir/{version:level}/public/android.jar", + "--android-jar-pattern someotherdir/{version:level}/public/android.jar", }, patterns) } |