Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd0b157c authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Allow C symbol file to be arch variant" into main

parents 0cdc3518 02be1018
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ type LibraryProperties struct {
	Stubs struct {
		// Relative path to the symbol map. The symbol map provides the list of
		// symbols that are exported for stubs variant of this library.
		Symbol_file *string `android:"path"`
		Symbol_file *string `android:"path,arch_variant"`

		// List versions to generate stubs libs for. The version name "current" is always
		// implicitly added.
@@ -75,7 +75,7 @@ type LibraryProperties struct {
		// implementation is made available by some other means, e.g. in a Microdroid
		// virtual machine.
		Implementation_installable *bool
	}
	} `android:"arch_variant"`

	// set the name of the output
	Stem *string `android:"arch_variant"`
@@ -118,7 +118,7 @@ type LibraryProperties struct {

	// If this is an LLNDK library, properties to describe the LLNDK stubs.  Will be copied from
	// the module pointed to by llndk_stubs if it is set.
	Llndk llndkLibraryProperties
	Llndk llndkLibraryProperties `android:"arch_variant"`

	// If this is a vendor public library, properties to describe the vendor public library stubs.
	Vendor_public_library vendorPublicLibraryProperties
+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ var (
type llndkLibraryProperties struct {
	// Relative path to the symbol map.
	// An example file can be seen here: TODO(danalbert): Make an example.
	Symbol_file *string
	Symbol_file *string `android:"path,arch_variant"`

	// Whether to export any headers as -isystem instead of -I. Mainly for use by
	// bionic/libc.