Differentiate sdk snapshot include dir by os type (ed62b9cc) · Commits · e / os / android_build_soong

cc/library_sdk_member.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -234,7 +234,7 @@ func addPossiblyArchSpecificProperties(sdkModuleContext android.ModuleContext, b
		for _, propertyInfo := range includeDirProperties {
		// Calculate the base directory in the snapshot into which the files will be copied.
		// lib.ArchType is "" for common properties.
		targetDir := filepath.Join(libInfo.archType, propertyInfo.snapshotDir)
		targetDir := filepath.Join(libInfo.OsPrefix(), libInfo.archType, propertyInfo.snapshotDir)

		propertyName := propertyInfo.propertyName

+9 −9

Original line number	Diff line number	Diff line
		@@ -1614,13 +1614,13 @@ cc_prebuilt_library_headers {
		sdk_member_name: "mynativeheaders",
		host_supported: true,
		stl: "none",
		export_system_include_dirs: ["include/include"],
		export_system_include_dirs: ["common_os/include/include"],
		target: {
		android: {
		export_include_dirs: ["include/include-android"],
		export_include_dirs: ["android/include/include-android"],
		},
		linux_glibc: {
		export_include_dirs: ["include/include-host"],
		export_include_dirs: ["linux_glibc/include/include-host"],
		},
		},
		}
		@@ -1630,13 +1630,13 @@ cc_prebuilt_library_headers {
		prefer: false,
		host_supported: true,
		stl: "none",
		export_system_include_dirs: ["include/include"],
		export_system_include_dirs: ["common_os/include/include"],
		target: {
		android: {
		export_include_dirs: ["include/include-android"],
		export_include_dirs: ["android/include/include-android"],
		},
		linux_glibc: {
		export_include_dirs: ["include/include-host"],
		export_include_dirs: ["linux_glibc/include/include-host"],
		},
		},
		}
		@@ -1648,9 +1648,9 @@ sdk_snapshot {
		}
		`),
		checkAllCopyRules(`
		include/Test.h -> include/include/Test.h
		include-android/AndroidTest.h -> include/include-android/AndroidTest.h
		include-host/HostTest.h -> include/include-host/HostTest.h
		include/Test.h -> common_os/include/include/Test.h
		include-android/AndroidTest.h -> android/include/include-android/AndroidTest.h
		include-host/HostTest.h -> linux_glibc/include/include-host/HostTest.h
		`),
		)
		}