summaryrefslogtreecommitdiff
path: root/android/variable.go
diff options
context:
space:
mode:
author Lukacs T. Berki <lberki@google.com> 2022-05-02 10:13:19 +0200
committer Lukacs T. Berki <lberki@google.com> 2022-05-04 09:12:01 +0200
commite3487c88482c96b31c8bd5ff4f14d3bc0e70b784 (patch)
tree29dae5eb3240ff3ca8e40629f2edfc6f664dc918 /android/variable.go
parenta704eb14690da4533c970e807a4224268cb499a0 (diff)
Add a test for correctness of C++ compilation.
This required the following: - Adding Platform_base_sdk_extension_version to default soong.variables - Teaching the symlink tree creation code to understand symlinks - Making finder.go follow symlinks when requested Adding yet another knob is unfortunate, but I can't allow that unconditionally because the Android code base contains a number of symlinks giving rise to infinite directory trees because they point back to their parent and this seemed preferable to adding complicated logic like "follow symlink but if only its fully resolved version does not point under the source tree". I could be convinced about the latter, though. Test: Presubmits. Change-Id: I453f6b7e5334771f5832c700db00f9d24ed1d82f
Diffstat (limited to 'android/variable.go')
-rw-r--r--android/variable.go13
1 files changed, 7 insertions, 6 deletions
diff --git a/android/variable.go b/android/variable.go
index 90cb6ff15..9478c0c9e 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -463,12 +463,13 @@ func (v *productVariables) SetDefaultConfig() {
*v = productVariables{
BuildNumberFile: stringPtr("build_number.txt"),
- Platform_version_name: stringPtr("S"),
- Platform_sdk_version: intPtr(30),
- Platform_sdk_codename: stringPtr("S"),
- Platform_sdk_final: boolPtr(false),
- Platform_version_active_codenames: []string{"S"},
- Platform_vndk_version: stringPtr("S"),
+ Platform_version_name: stringPtr("S"),
+ Platform_base_sdk_extension_version: intPtr(30),
+ Platform_sdk_version: intPtr(30),
+ Platform_sdk_codename: stringPtr("S"),
+ Platform_sdk_final: boolPtr(false),
+ Platform_version_active_codenames: []string{"S"},
+ Platform_vndk_version: stringPtr("S"),
HostArch: stringPtr("x86_64"),
HostSecondaryArch: stringPtr("x86"),