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
diff --git a/android/Android.bp b/android/Android.bp
index cbd3459..f58a472 100644
--- a/android/Android.bp
+++ b/android/Android.bp
@@ -88,6 +88,7 @@
"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 95%
rename from apex/constants.go
rename to android/updatable_modules.go
index 82eebff..1548170 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 @@
// * 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 6533c61..480ad06 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -26,7 +26,6 @@
"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 1956b44..d1f2691 100644
--- a/apex/builder.go
+++ b/apex/builder.go
@@ -214,7 +214,7 @@
Args: map[string]string{
"provideNativeLibs": strings.Join(provideNativeLibs, " "),
"requireNativeLibs": strings.Join(requireNativeLibs, " "),
- "default_version": defaultManifestVersion,
+ "default_version": android.DefaultUpdatableModuleVersion,
"opt": strings.Join(optCommands, " "),
},
})