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
This commit is contained in:
@@ -88,6 +88,7 @@ bootstrap_go_package {
|
||||
"test_asserts.go",
|
||||
"test_suites.go",
|
||||
"testing.go",
|
||||
"updatable_modules.go",
|
||||
"util.go",
|
||||
"variable.go",
|
||||
"visibility.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"
|
@@ -26,7 +26,6 @@ bootstrap_go_package {
|
||||
"apex_sdk_member.go",
|
||||
"apex_singleton.go",
|
||||
"builder.go",
|
||||
"constants.go",
|
||||
"deapexer.go",
|
||||
"key.go",
|
||||
"prebuilt.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, " "),
|
||||
},
|
||||
})
|
||||
|
Reference in New Issue
Block a user