StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Moving default version outside of apex package" am: 21b027dca8 am: 18ecb86247

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2167105

Change-Id: I14e748b60f758db5e002c13f0d39738de9acd1b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alexei Nicoara
2022-08-02 09:36:30 +00:00
committed by Automerger Merge Worker
parent 5525801a3c 18ecb86247
commit 65e6a8c7b9
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/Android.bp
View File

@@ -88,6 +88,7 @@ bootstrap_go_package {
"test_asserts.go", "test_asserts.go",
"test_suites.go", "test_suites.go",
"testing.go", "testing.go",
"updatable_modules.go",
"util.go", "util.go",
"variable.go", "variable.go",
"visibility.go", "visibility.go",

10
apex/constants.go → android/updatable_modules.go
View File

@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
package apex package android
// This file contains branch specific constants. They are stored in a separate // This file contains branch specific constants for building updatable modules.
// file to minimise the potential of merge conflicts between branches when // They are stored in a separate file to minimise the potential of merge
// the code from the package is changed. // conflicts between branches when the code from the package is changed.
// The default manifest version for all the modules on this branch. // 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 // This version code will be used only if there is no version field in the
@@ -33,4 +33,4 @@ package apex
// * AOSP - xx9990000 // * AOSP - xx9990000
// * x-mainline-prod - xx9990000 // * x-mainline-prod - xx9990000
// * master - 990090000 // * master - 990090000
const defaultManifestVersion = "339990000" const DefaultUpdatableModuleVersion = "339990000"

1
apex/Android.bp
View File

@@ -26,7 +26,6 @@ bootstrap_go_package {
"apex_sdk_member.go", "apex_sdk_member.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",

2
apex/builder.go
View File

@@ -214,7 +214,7 @@ func (a *apexBundle) buildManifest(ctx android.ModuleContext, provideNativeLibs,
Args: map[string]string{ Args: map[string]string{
"provideNativeLibs": strings.Join(provideNativeLibs, " "), "provideNativeLibs": strings.Join(provideNativeLibs, " "),
"requireNativeLibs": strings.Join(requireNativeLibs, " "), "requireNativeLibs": strings.Join(requireNativeLibs, " "),
"default_version": defaultManifestVersion, "default_version": android.DefaultUpdatableModuleVersion,
"opt": strings.Join(optCommands, " "), "opt": strings.Join(optCommands, " "),
}, },
}) })