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

Merge "Merge Android U (ab/10368041)" into aosp-main-future

Browse Source
This commit is contained in:
Xin Li
2023-08-28 22:12:56 +00:00
committed by Android (Google) Code Review
parent b6d55182c8 16b7e67db6
commit a4479de778
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/apex.go
View File

@@ -482,7 +482,9 @@ func CheckAvailableForApex(what string, apex_available []string) bool {
}
return InList(what, 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

8
android/updatable_modules.go
View File

@@ -14,9 +14,9 @@
package android
// 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.
// 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
@@ -33,4 +33,4 @@ package android
// * AOSP - xx9990000
// * x-mainline-prod - xx9990000
// * master - 990090000
const DefaultUpdatableModuleVersion = "339990000"
const DefaultUpdatableModuleVersion = "340090000"

4
docs/clion.md
View File

@@ -3,6 +3,10 @@
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).
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:
```bash