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

Commit 5a380349 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 14 

Bug: 298295554
Merged-In: Idc0ff2f20e54b81cfdf61472a72e9cb027f60554
Change-Id: I6c032acf0826b910d045a7a23373597c78a5ee0a
parents 4db4f814 9994462c

android/apex.go

+3 −1
Original line number Original line Diff line number Diff line
@@ -482,7 +482,9 @@ func CheckAvailableForApex(what string, apex_available []string) bool { 
	}

	}

	return InList(what, apex_available) ||

	return InList(what, apex_available) ||

		(what != AvailableToPlatform && InList(AvailableToAnyApex, apex_available)) ||

		(what != AvailableToPlatform && InList(AvailableToAnyApex, apex_available)) ||

		(strings.HasPrefix(what, "com.android.gki.") && InList(AvailableToGkiApex, apex_available))

		(strings.HasPrefix(what, "com.android.gki.") && InList(AvailableToGkiApex, apex_available)) ||

		(what == "com.google.mainline.primary.libs") || // TODO b/248601389

		(what == "com.google.mainline.go.primary.libs") // TODO b/248601389

}

}





// Implements ApexModule

// Implements ApexModule

android/updatable_modules.go

+4 −4
Original line number Original line Diff line number Diff line
@@ -14,9 +14,9 @@ 




package android

package android





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

// This file contains branch specific constants. They are stored in a separate

// They are stored in a separate file to minimise the potential of merge

// file to minimise the potential of merge conflicts between branches when

// conflicts between branches when the code from the package is changed.

// 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 android 
// * AOSP            - xx9990000

// * AOSP            - xx9990000

// * x-mainline-prod - xx9990000

// * x-mainline-prod - xx9990000

// * master          - 990090000

// * master          - 990090000

const DefaultUpdatableModuleVersion = "339990000"
 
const DefaultUpdatableModuleVersion = "340090000"

docs/clion.md

+4 −0
Original line number Original line Diff line number Diff line
@@ -3,6 +3,10 @@ 
Soong can generate CLion projects. This is intended for source code editing

Soong can generate CLion projects. This is intended for source code editing

only. Build should still be done via make/m/mm(a)/mmm(a).

only. Build should still be done via make/m/mm(a)/mmm(a).





Note: alternatively, you can use

[aidegen to generate a Clion or VSCode project](https://android.googlesource.com/platform/tools/asuite/+/refs/heads/master/aidegen/README.md)

with a single command, using the `-i c` flag.



CMakeLists.txt project file generation is enabled via environment variable:

CMakeLists.txt project file generation is enabled via environment variable:





```bash

```bash