diff options
| -rw-r--r-- | android/apex.go | 10 | ||||
| -rw-r--r-- | android/module.go | 4 | ||||
| -rw-r--r-- | cc/cc.go | 40 | ||||
| -rw-r--r-- | cc/config/global.go | 5 | ||||
| -rw-r--r-- | dexpreopt/OWNERS | 2 | ||||
| -rw-r--r-- | java/OWNERS | 2 | ||||
| -rw-r--r-- | scripts/OWNERS | 2 |
7 files changed, 60 insertions, 5 deletions
diff --git a/android/apex.go b/android/apex.go index 4618fe97e..5b2e92c4a 100644 --- a/android/apex.go +++ b/android/apex.go @@ -87,6 +87,16 @@ type ApexInfo struct { var ApexInfoProvider = blueprint.NewMutatorProvider(ApexInfo{}, "apex") +func (i ApexInfo) AddJSONData(d *map[string]interface{}) { + (*d)["Apex"] = map[string]interface{}{ + "ApexVariationName": i.ApexVariationName, + "MinSdkVersion": i.MinSdkVersion, + "InApexModules": i.InApexModules, + "InApexVariants": i.InApexVariants, + "ForPrebuiltApex": i.ForPrebuiltApex, + } +} + // mergedName gives the name of the alias variation that will be used when multiple apex variations // of a module can be deduped into one variation. For example, if libfoo is included in both apex.a // and apex.b, and if the two APEXes have the same min_sdk_version (say 29), then libfoo doesn't diff --git a/android/module.go b/android/module.go index f745a4ab4..07d82f1a6 100644 --- a/android/module.go +++ b/android/module.go @@ -1190,6 +1190,10 @@ type ModuleBase struct { vintfFragmentsPaths Paths } +func (m *ModuleBase) AddJSONData(d *map[string]interface{}) { + (*d)["Android"] = map[string]interface{}{} +} + func (m *ModuleBase) ComponentDepsMutator(BottomUpMutatorContext) {} func (m *ModuleBase) DepsMutator(BottomUpMutatorContext) {} @@ -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{ diff --git a/dexpreopt/OWNERS b/dexpreopt/OWNERS index 166472fcd..5a2a1983f 100644 --- a/dexpreopt/OWNERS +++ b/dexpreopt/OWNERS @@ -1 +1 @@ -per-file * = ngeoffray@google.com,calin@google.com,mathieuc@google.com +per-file * = ngeoffray@google.com,calin@google.com,skvadrik@google.com diff --git a/java/OWNERS b/java/OWNERS index 16ef4d812..52427120d 100644 --- a/java/OWNERS +++ b/java/OWNERS @@ -1 +1 @@ -per-file dexpreopt*.go = ngeoffray@google.com,calin@google.com,mathieuc@google.com +per-file dexpreopt*.go = ngeoffray@google.com,calin@google.com,skvadrik@google.com diff --git a/scripts/OWNERS b/scripts/OWNERS index 2b9c2ded9..1830a1823 100644 --- a/scripts/OWNERS +++ b/scripts/OWNERS @@ -1,6 +1,6 @@ per-file system-clang-format,system-clang-format-2 = enh@google.com,smoreland@google.com per-file build-mainline-modules.sh = ngeoffray@google.com,paulduffin@google.com,mast@google.com per-file build-aml-prebuilts.sh = ngeoffray@google.com,paulduffin@google.com,mast@google.com -per-file construct_context.py = ngeoffray@google.com,calin@google.com,mathieuc@google.com,skvadrik@google.com +per-file construct_context.py = ngeoffray@google.com,calin@google.com,skvadrik@google.com per-file conv_linker_config.py = kiyoungkim@google.com, jiyong@google.com, jooyung@google.com per-file gen_ndk*.sh = sophiez@google.com, allenhair@google.com |