Merge "Passing the default apex version to the apexer" am: 5b96d35851
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2104336 Change-Id: I8e43672285f5612f5f06730b144c2854a54a57e8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
ffe4e6394e
3 changed files with 39 additions and 0 deletions
|
@ -25,6 +25,7 @@ bootstrap_go_package {
|
||||||
"apex.go",
|
"apex.go",
|
||||||
"apex_singleton.go",
|
"apex_singleton.go",
|
||||||
"builder.go",
|
"builder.go",
|
||||||
|
"constants.go",
|
||||||
"deapexer.go",
|
"deapexer.go",
|
||||||
"key.go",
|
"key.go",
|
||||||
"prebuilt.go",
|
"prebuilt.go",
|
||||||
|
|
|
@ -650,6 +650,8 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) {
|
||||||
optFlags = append(optFlags, "--manifest_json "+a.manifestJsonOut.String())
|
optFlags = append(optFlags, "--manifest_json "+a.manifestJsonOut.String())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
optFlags = append(optFlags, "--apex_version "+defaultManifestVersion)
|
||||||
|
|
||||||
optFlags = append(optFlags, "--payload_fs_type "+a.payloadFsType.string())
|
optFlags = append(optFlags, "--payload_fs_type "+a.payloadFsType.string())
|
||||||
|
|
||||||
ctx.Build(pctx, android.BuildParams{
|
ctx.Build(pctx, android.BuildParams{
|
||||||
|
|
36
apex/constants.go
Normal file
36
apex/constants.go
Normal file
|
@ -0,0 +1,36 @@
|
||||||
|
// Copyright (C) 2022 The Android Open Source Project
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
package apex
|
||||||
|
|
||||||
|
// 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.
|
||||||
|
|
||||||
|
// 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
|
||||||
|
// module's apex_manifest.json. Release branches have their version injected
|
||||||
|
// into apex_manifest.json by the tooling and will not use the version set
|
||||||
|
// here. Developers can also set the version field locally in the
|
||||||
|
// apex_manifest.json to build a module with a specific version.
|
||||||
|
//
|
||||||
|
// The value follows the schema from go/mainline-version-codes, and is chosen
|
||||||
|
// based on the branch such that the builds from testing and development
|
||||||
|
// branches will have a version higher than the prebuilts.
|
||||||
|
// Versions per branch:
|
||||||
|
// * x-dev - xx0090000 (where xx is the branch SDK level)
|
||||||
|
// * AOSP - xx9990000
|
||||||
|
// * x-mainline-prod - xx9990000
|
||||||
|
// * master - 990090000
|
||||||
|
const defaultManifestVersion = "339990000"
|
Loading…
Reference in a new issue