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

Commit 95a4bedc authored by Pirama Arumuga Nainar's avatar Pirama Arumuga Nainar Committed by Android (Google) Code Review
Browse files

Merge changes from topic "libbinder.stable.abi" into sc-dev 

* changes:
  [cc/pgo] Mark pgo.sampling property as an arch-variant
  Disable TestCcLibraryBp2Build in sc-dev
  Mark more fields in BaseLinkerProperties as arch variant
parents b1cba215 19a5aae3

bp2build/cc_library_conversion_test.go

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ toolchain_library { 
)



func TestCcLibraryBp2Build(t *testing.T) {

	// b/191166471 disabled in sc-dev

	t.Skip()

	testCases := []struct {

		description                        string

		moduleTypeUnderTest                string

cc/linker.go

+2 −2
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ type BaseLinkerProperties struct { 


			// version script for vendor or product variant

			Version_script *string `android:"arch_variant"`

		}

		} `android:"arch_variant"`

		Recovery struct {

			// list of shared libs that only should be used to build the recovery

			// variant of the C/C++ module.
@@ -182,7 +182,7 @@ type BaseLinkerProperties struct { 
			// variant of the C/C++ module.

			Exclude_static_libs []string

		}

	}

	} `android:"arch_variant"`



	// make android::build:GetBuildNumber() available containing the build ID.

	Use_version_lib *bool `android:"arch_variant"`

cc/pgo.go

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ func recordMissingProfileFile(ctx BaseModuleContext, missing string) { 
type PgoProperties struct {

	Pgo struct {

		Instrumentation    *bool

		Sampling           *bool

		Sampling           *bool   `android:"arch_variant"`

		Profile_file       *string `android:"arch_variant"`

		Benchmarks         []string

		Enable_profile_use *bool `android:"arch_variant"`