Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21b027dc authored by Alexei Nicoara's avatar Alexei Nicoara Committed by Gerrit Code Review
Browse files

Merge "Moving default version outside of apex package"

parents d13d15a9 7579b67e

android/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ bootstrap_go_package { 
        "test_asserts.go",

        "test_suites.go",

        "testing.go",

        "updatable_modules.go",

        "util.go",

        "variable.go",

        "visibility.go",

apex/constants.go→android/updatable_modules.go

+5 −5
Original line number Diff line number Diff line
@@ -12,11 +12,11 @@ 
// 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

// the code from the package is changed.

// This file contains branch specific constants for building updatable modules.

// 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
@@ -33,4 +33,4 @@ package apex 
// * AOSP            - xx9990000

// * x-mainline-prod - xx9990000

// * master          - 990090000

const defaultManifestVersion = "339990000"
 
const DefaultUpdatableModuleVersion = "339990000"

apex/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ bootstrap_go_package { 
        "apex_sdk_member.go",

        "apex_singleton.go",

        "builder.go",

        "constants.go",

        "deapexer.go",

        "key.go",

        "prebuilt.go",

apex/builder.go

+1 −1
Original line number Diff line number Diff line
@@ -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, " "),

		},

	})