diff --git a/android/Android.bp b/android/Android.bp index cbd345945..f58a47296 100644 --- a/android/Android.bp +++ b/android/Android.bp @@ -88,6 +88,7 @@ bootstrap_go_package { "test_asserts.go", "test_suites.go", "testing.go", + "updatable_modules.go", "util.go", "variable.go", "visibility.go", diff --git a/apex/constants.go b/android/updatable_modules.go similarity index 83% rename from apex/constants.go rename to android/updatable_modules.go index c68edb724..71c76c56a 100644 --- a/apex/constants.go +++ b/android/updatable_modules.go @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package apex +package android -// This file contains branch specific constants. They are stored in a separate -// file to minimise the potential of merge conflicts between branches when -// the code from the package is changed. +// This file contains branch specific constants for building updatable modules. +// They are stored in a separate file to minimise the potential of merge +// conflicts between branches when the code from the package is changed. // The default manifest version for all the modules on this branch. // This version code will be used only if there is no version field in the @@ -33,4 +33,4 @@ package apex // * AOSP - xx9990000 // * x-mainline-prod - xx9990000 // * master - 990090000 -const defaultManifestVersion = "339990000" +const DefaultUpdatableModuleVersion = "339990000" diff --git a/apex/Android.bp b/apex/Android.bp index 6533c6103..480ad0662 100644 --- a/apex/Android.bp +++ b/apex/Android.bp @@ -26,7 +26,6 @@ bootstrap_go_package { "apex_sdk_member.go", "apex_singleton.go", "builder.go", - "constants.go", "deapexer.go", "key.go", "prebuilt.go", diff --git a/apex/builder.go b/apex/builder.go index 58acf71d6..f1b14484e 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -214,7 +214,7 @@ func (a *apexBundle) buildManifest(ctx android.ModuleContext, provideNativeLibs, Args: map[string]string{ "provideNativeLibs": strings.Join(provideNativeLibs, " "), "requireNativeLibs": strings.Join(requireNativeLibs, " "), - "default_version": defaultManifestVersion, + "default_version": android.DefaultUpdatableModuleVersion, "opt": strings.Join(optCommands, " "), }, })