diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 06:57:05 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 06:57:05 +0000 |
commit | e5917fa9f124274f098863cd99672bb65d36bff1 (patch) | |
tree | ea83d46c11343ef2a1d4ed0ae2467247f7bd3c8e | |
parent | c77edc5afa4dfa2afa74fd65c53e20b2a0cae3b2 (diff) | |
parent | edc8476c5f2fc9893d24e54c462e3225d711b724 (diff) | |
download | libchrome-aml_res_331512000.tar.gz |
Snap for 8564071 from edc8476c5f2fc9893d24e54c462e3225d711b724 to mainline-resolv-releaseaml_res_331820000aml_res_331611010aml_res_331512000aml_res_331314010aml_res_331114000aml_res_331011050aml_res_330910000aml_res_330810000android13-mainline-resolv-release
Change-Id: Ie9a94d5e1f18d0b148b35c36d9e19b93ed3ff5ee
-rw-r--r-- | Android.bp | 19 | ||||
-rw-r--r-- | base/threading/thread_local_storage_unittest.cc | 4 | ||||
-rw-r--r-- | soong/bindings_generator.go | 60 |
3 files changed, 31 insertions, 52 deletions
diff --git a/Android.bp b/Android.bp index 6bd807c029..aada4d99f9 100644 --- a/Android.bp +++ b/Android.bp @@ -513,8 +513,6 @@ gensrcs { cc_defaults { name: "libchrome-defaults", - // Set clang to "true" to force clang or "false" to force gcc. - // clang: true, cflags: [ "-Wall", @@ -774,7 +772,13 @@ libchromeLinuxSrc = [ "base/threading/platform_thread_linux.cc", ] -libchromeLinuxGlibcSrc = [ +libchromeMuslSrc = [ + "base/debug/stack_trace_posix.cc", + "base/memory/platform_shared_memory_region_posix.cc", + "base/memory/shared_memory_handle_posix.cc", +] + +libchromeGlibcSrc = [ "base/allocator/allocator_shim.cc", "base/allocator/allocator_shim_default_dispatch_to_glibc.cc", "base/debug/stack_trace_posix.cc", @@ -815,6 +819,7 @@ libchromeAndroidSrc = [ cc_library { name: "libchrome", host_supported: true, + ramdisk_available: true, recovery_available: true, vendor_available: true, defaults: ["libchrome-defaults"], @@ -849,8 +854,11 @@ cc_library { "liblog", ], }, - linux_glibc: { - srcs: libchromeLinuxGlibcSrc, + glibc: { + srcs: libchromeGlibcSrc, + }, + musl: { + srcs: libchromeMuslSrc, }, android: { srcs: libchromeAndroidSrc, @@ -860,6 +868,7 @@ cc_library { ], }, }, + min_sdk_version: "30", } // libchrome-crypto shared library for device diff --git a/base/threading/thread_local_storage_unittest.cc b/base/threading/thread_local_storage_unittest.cc index 9062ff0c7f..64bc398cea 100644 --- a/base/threading/thread_local_storage_unittest.cc +++ b/base/threading/thread_local_storage_unittest.cc @@ -84,9 +84,9 @@ class ThreadLocalStorageRunner : public DelegateSimpleThread::Delegate { void ThreadLocalStorageCleanup(void *value) { - int *ptr = reinterpret_cast<int*>(value); + int *ptr = static_cast<int*>(value); // Destructors should never be called with a NULL. - ASSERT_NE(reinterpret_cast<int*>(NULL), ptr); + ASSERT_NE(nullptr, ptr); if (*ptr == kFinalTlsValue) return; // We've been called enough times. ASSERT_LT(kFinalTlsValue, *ptr); diff --git a/soong/bindings_generator.go b/soong/bindings_generator.go index 7ff98262ed..98a27a2781 100644 --- a/soong/bindings_generator.go +++ b/soong/bindings_generator.go @@ -79,7 +79,7 @@ var ( type mojomDowngradedFilesProperties struct { // list of input files - Srcs []string + Srcs []string `android:"path"` } type mojomDowngradedFiles struct { @@ -93,14 +93,10 @@ type mojomDowngradedFiles struct { var _ genrule.SourceFileGenerator = (*mojomDowngradedFiles)(nil) -func (m *mojomDowngradedFiles) DepsMutator(ctx android.BottomUpMutatorContext) { - android.ExtractSourcesDeps(ctx, m.properties.Srcs) -} - func (m *mojomDowngradedFiles) GenerateAndroidBuildActions(ctx android.ModuleContext) { m.outDir = android.PathForModuleGen(ctx, "") - for _, in := range ctx.ExpandSources(m.properties.Srcs, nil) { + for _, in := range android.PathsForModuleSrc(ctx, m.properties.Srcs) { if !strings.HasSuffix(in.Rel(), ".mojom") { ctx.PropertyErrorf("srcs", "Source is not a .mojom file: %s", in.Rel()) continue @@ -145,7 +141,7 @@ func mojomDowngradedFilesFactory() android.Module { type mojomPicklesProperties struct { // list of input files - Srcs []string + Srcs []string `android:"path"` } type mojomPickles struct { @@ -159,14 +155,10 @@ type mojomPickles struct { var _ genrule.SourceFileGenerator = (*mojomPickles)(nil) -func (m *mojomPickles) DepsMutator(ctx android.BottomUpMutatorContext) { - android.ExtractSourcesDeps(ctx, m.properties.Srcs) -} - func (m *mojomPickles) GenerateAndroidBuildActions(ctx android.ModuleContext) { m.outDir = android.PathForModuleGen(ctx, "") - for _, in := range ctx.ExpandSources(m.properties.Srcs, nil) { + for _, in := range android.PathsForModuleSrc(ctx, m.properties.Srcs) { if !strings.HasSuffix(in.Rel(), ".mojom") { ctx.PropertyErrorf("srcs", "Source is not a .mojom file: %s", in.Rel()) continue @@ -218,46 +210,36 @@ func mojomPicklesFactory() android.Module { // source and Java source modules. type mojomGenerationProperties struct { // list of input files - Srcs []string + Srcs []string `android:"path"` // name of the output .srcjar Srcjar string // name of the templates module - Templates string + Templates string `android:"path"` // Additional flags to pass to the bindings generation script Flags string // list of pickles modules that will be imported - Pickles []string + Pickles []string `android:"path"` // list of include paths Includes []string // list of typemaps modules that will be imported - Typemaps []string + Typemaps []string `android:"path"` // If true, set --use_once_callback flag to the generator. // This works only on C++ generation. Use_once_callback bool } -// extractSources adds any necessary dependencies to satisfy filegroup or -// generated sources modules listed in the properties using ":module" syntax, -// if any. -func (p *mojomGenerationProperties) extractSources(ctx android.BottomUpMutatorContext) { - android.ExtractSourcesDeps(ctx, p.Srcs) - android.ExtractSourcesDeps(ctx, p.Typemaps) - android.ExtractSourcesDeps(ctx, p.Pickles) - android.ExtractSourceDeps(ctx, &p.Templates) -} - // flags generates all needed flags for the build rule. func (p *mojomGenerationProperties) flags(ctx android.ModuleContext) string { flags := []string{} - for _, typemap := range ctx.ExpandSources(p.Typemaps, nil) { + for _, typemap := range android.PathsForModuleSrc(ctx, p.Typemaps) { flags = append(flags, fmt.Sprintf("--typemap=%s", typemap.String())) } for _, include := range android.PathsForSource(ctx, p.Includes) { @@ -269,7 +251,7 @@ func (p *mojomGenerationProperties) flags(ctx android.ModuleContext) string { ctx.PropertyErrorf("pickles", "not a module: %q", m) continue } - module := ctx.GetDirectDepWithTag(m, android.SourceDepTag).(*mojomPickles) + module := android.GetModuleFromPathDep(ctx, m, "").(*mojomPickles) flags = append(flags, fmt.Sprintf("--gen_dir=%s", module.outDir.String())) } if p.Flags != "" { @@ -285,15 +267,15 @@ func (p *mojomGenerationProperties) flags(ctx android.ModuleContext) string { // implicitDeps collects all dependencies of the module. func (p *mojomGenerationProperties) implicitDeps(ctx android.ModuleContext) android.Paths { deps := android.Paths{} - deps = append(deps, ctx.ExpandSources(p.Pickles, nil)...) - deps = append(deps, ctx.ExpandSources(p.Typemaps, nil)...) - deps = append(deps, ctx.ExpandSources([]string{p.Templates}, nil)...) + deps = append(deps, android.PathsForModuleSrc(ctx, p.Pickles)...) + deps = append(deps, android.PathsForModuleSrc(ctx, p.Typemaps)...) + deps = append(deps, android.PathsForModuleSrc(ctx, []string{p.Templates})...) return deps } // templateDir returns the path where the template .zips are located. func (p *mojomGenerationProperties) templateDir(ctx android.ModuleContext) string { - srcFiles := ctx.ExpandSources([]string{p.Templates}, nil) + srcFiles := android.PathsForModuleSrc(ctx, []string{p.Templates}) if len(srcFiles) == 0 { ctx.PropertyErrorf("templates", "module %s does not produce any files", p.Templates) return "" @@ -320,7 +302,7 @@ func (p *mojomGenerationProperties) generateBuildActions( templateDir := p.templateDir(ctx) generatedSrcs := android.Paths{} - for _, in := range ctx.ExpandSources(p.Srcs, nil) { + for _, in := range android.PathsForModuleSrc(ctx, p.Srcs) { if !strings.HasSuffix(in.Rel(), ".mojom") { ctx.PropertyErrorf("srcs", "Source is not a .mojom file: %s", in.Rel()) continue @@ -366,10 +348,6 @@ type mojomHeaders struct { var _ genrule.SourceFileGenerator = (*mojomHeaders)(nil) -func (m *mojomHeaders) DepsMutator(ctx android.BottomUpMutatorContext) { - m.properties.extractSources(ctx) -} - func (m *mojomHeaders) GenerateAndroidBuildActions(ctx android.ModuleContext) { m.generatedSrcs = m.properties.generateBuildActions( ctx, @@ -426,10 +404,6 @@ type mojomSrcs struct { var _ genrule.SourceFileGenerator = (*mojomSrcs)(nil) -func (m *mojomSrcs) DepsMutator(ctx android.BottomUpMutatorContext) { - m.properties.extractSources(ctx) -} - func (m *mojomSrcs) GenerateAndroidBuildActions(ctx android.ModuleContext) { m.generatedSrcs = m.properties.generateBuildActions( ctx, @@ -482,10 +456,6 @@ type mojomSrcjar struct { var _ genrule.SourceFileGenerator = (*mojomSrcjar)(nil) -func (m *mojomSrcjar) DepsMutator(ctx android.BottomUpMutatorContext) { - m.properties.extractSources(ctx) -} - func (m *mojomSrcjar) GenerateAndroidBuildActions(ctx android.ModuleContext) { srcjars := m.properties.generateBuildActions( ctx, |