Merge "Propagate vendor_available property through to sdk snapshot" (4964a5e0) · Commits · e / os / android_build_soong

cc/library_sdk_member.go

+4 −0

Original line number	Diff line number	Diff line
		@@ -119,6 +119,10 @@ func (mt *librarySdkMemberType) AddPrebuiltModule(ctx android.SdkMemberContext,

		ccModule := member.Variants()[0].(*Module)

		if proptools.Bool(ccModule.VendorProperties.Vendor_available) {
		pbm.AddProperty("vendor_available", true)
		}

		sdkVersion := ccModule.SdkVersion()
		if sdkVersion != "" {
		pbm.AddProperty("sdk_version", sdkVersion)

+3 −0

Original line number	Diff line number	Diff line
		@@ -1672,6 +1672,7 @@ func TestSnapshotWithCcLibrary(t *testing.T) {
		],
		export_include_dirs: ["include"],
		stl: "none",
		vendor_available: true,
		}
		`)

		@@ -1683,6 +1684,7 @@ cc_prebuilt_library {
		name: "myexports_mynativelib@current",
		sdk_member_name: "mynativelib",
		installable: false,
		vendor_available: true,
		stl: "none",
		compile_multilib: "both",
		export_include_dirs: ["include/include"],
		@@ -1709,6 +1711,7 @@ cc_prebuilt_library {
		cc_prebuilt_library {
		name: "mynativelib",
		prefer: false,
		vendor_available: true,
		stl: "none",
		compile_multilib: "both",
		export_include_dirs: ["include/include"],