Merge changes from topic "canned_fs_config" am: ae9cf26353 am: 33fd601118 am: a214351987
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918606
Change-Id: I5a61bafbe778bb2bbfec03d2349d4d787e3c29f2
diff --git a/android/api_levels.go b/android/api_levels.go
index 1fbbc15..a5a7a97 100644
--- a/android/api_levels.go
+++ b/android/api_levels.go
@@ -321,6 +321,7 @@
"Q": 29,
"R": 30,
"S": 31,
+ "S-V2": 32,
}
// TODO: Differentiate "current" and "future".
@@ -364,6 +365,7 @@
"Q": 29,
"R": 30,
"S": 31,
+ "S-V2": 32,
}
for i, codename := range config.PlatformVersionActiveCodenames() {
apiLevelsMap[codename] = previewAPILevelBase + i
diff --git a/android/variable.go b/android/variable.go
index a7068108..2697353 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -124,6 +124,8 @@
Shared_libs []string
Cmdline []string
+ Srcs []string
+ Exclude_srcs []string
}
// eng is true for -eng builds, and can be used to turn on additionaly heavyweight debugging