From 9dc59c9e30492532661e5d3952e0d88df6ff7ee3 Mon Sep 17 00:00:00 2001
From: Alexei Nicoara <ancr@google.com>
Date: Wed, 27 Jul 2022 14:52:12 +0100
Subject: [PATCH] Moving default version outside of apex package

The default version needs to be used by both apex and apk updatable
modules. Moving it to android package so it can be accessed without
circular dependencies.

Test: presubmit
Bug: 231691162

Change-Id: Icafd50d0b065e89a115ae9c9b6ea55adf2730b49
---
 android/Android.bp                                | 1 +
 apex/constants.go => android/updatable_modules.go | 4 ++--
 apex/Android.bp                                   | 1 -
 apex/builder.go                                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename apex/constants.go => android/updatable_modules.go (96%)

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 96%
rename from apex/constants.go
rename to android/updatable_modules.go
index 82eebffde..1548170f9 100644
--- a/apex/constants.go
+++ b/android/updatable_modules.go
@@ -12,7 +12,7 @@
 // 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
@@ -33,4 +33,4 @@ package apex
 // * AOSP            - xx9990000
 // * x-mainline-prod - xx9990000
 // * master          - 990090000
-const defaultManifestVersion = "990090000"
+const DefaultUpdatableModuleVersion = "990090000"
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 1956b4447..d1f269139 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, " "),
 		},
 	})