diff options
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/cc.go | 40 | ||||
| -rw-r--r-- | cc/config/global.go | 5 |
2 files changed, 43 insertions, 2 deletions
@@ -831,6 +831,46 @@ type Module struct { hideApexVariantFromMake bool } +func (c *Module) AddJSONData(d *map[string]interface{}) { + c.AndroidModuleBase().AddJSONData(d) + (*d)["Cc"] = map[string]interface{}{ + "SdkVersion": c.SdkVersion(), + "MinSdkVersion": c.MinSdkVersion(), + "VndkVersion": c.VndkVersion(), + "ProductSpecific": c.ProductSpecific(), + "SocSpecific": c.SocSpecific(), + "DeviceSpecific": c.DeviceSpecific(), + "InProduct": c.InProduct(), + "InVendor": c.InVendor(), + "InRamdisk": c.InRamdisk(), + "InVendorRamdisk": c.InVendorRamdisk(), + "InRecovery": c.InRecovery(), + "VendorAvailable": c.VendorAvailable(), + "ProductAvailable": c.ProductAvailable(), + "RamdiskAvailable": c.RamdiskAvailable(), + "VendorRamdiskAvailable": c.VendorRamdiskAvailable(), + "RecoveryAvailable": c.RecoveryAvailable(), + "OdmAvailable": c.OdmAvailable(), + "InstallInData": c.InstallInData(), + "InstallInRamdisk": c.InstallInRamdisk(), + "InstallInSanitizerDir": c.InstallInSanitizerDir(), + "InstallInVendorRamdisk": c.InstallInVendorRamdisk(), + "InstallInRecovery": c.InstallInRecovery(), + "InstallInRoot": c.InstallInRoot(), + "IsVndk": c.IsVndk(), + "IsVndkExt": c.IsVndkExt(), + "IsVndkPrivate": c.IsVndkPrivate(), + "IsVndkSp": c.IsVndkSp(), + "IsLlndk": c.IsLlndk(), + "IsLlndkPublic": c.IsLlndkPublic(), + "IsSnapshotLibrary": c.IsSnapshotLibrary(), + "IsSnapshotPrebuilt": c.IsSnapshotPrebuilt(), + "IsVendorPublicLibrary": c.IsVendorPublicLibrary(), + "ApexSdkVersion": c.apexSdkVersion, + "TestFor": c.TestFor(), + } +} + func (c *Module) SetPreventInstall() { c.Properties.PreventInstall = true } diff --git a/cc/config/global.go b/cc/config/global.go index 24e10a458..495776795 100644 --- a/cc/config/global.go +++ b/cc/config/global.go @@ -46,6 +46,7 @@ var ( "-O2", "-g", + "-fdebug-default-version=5", "-fdebug-info-for-profiling", "-fno-strict-aliasing", @@ -145,8 +146,8 @@ var ( // prebuilts/clang default settings. ClangDefaultBase = "prebuilts/clang/host" - ClangDefaultVersion = "clang-r416183b" - ClangDefaultShortVersion = "12.0.5" + ClangDefaultVersion = "clang-r416183b1" + ClangDefaultShortVersion = "12.0.7" // Directories with warnings from Android.bp files. WarningAllowedProjects = []string{ |