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

Commit fe813c53 authored by Liz Kammer's avatar Liz Kammer Committed by Gerrit Code Review
Browse files

Merge "Delete toolchain_library"

parents 1e698865 718eb27f

Android.bp

+0 −19
Original line number Diff line number Diff line
@@ -46,25 +46,6 @@ cc_defaults { 
// C static libraries extracted from the gcc toolchain

//



toolchain_library {

    name: "libwinpthread",

    host_supported: true,

    enabled: false,

    target: {

        windows: {

            enabled: true,

        },

        windows_x86: {

            src: "prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/lib32/libwinpthread.a",

        },

        windows_x86_64: {

            src: "prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/lib/libwinpthread.a",

        },

    },

    notice: ":mingw-libwinpthread-notice",

    licenses: ["winpthreads_license"],

}



kernel_headers {

    name: "device_kernel_headers",

    vendor: true,

bp2build/cc_library_conversion_test.go

+1 −13
Original line number Diff line number Diff line
@@ -27,17 +27,6 @@ const ( 
	soongCcLibraryPreamble = `

cc_defaults {

    name: "linux_bionic_supported",

}



toolchain_library {

    name: "libclang_rt.builtins-x86_64-android",

    defaults: ["linux_bionic_supported"],

    vendor_available: true,

    vendor_ramdisk_available: true,

    product_available: true,

    recovery_available: true,

    native_bridge_supported: true,

    src: "",

}`



	soongCcProtoLibraries = `
@@ -64,7 +53,6 @@ func registerCcLibraryModuleTypes(ctx android.RegistrationContext) { 
	ctx.RegisterModuleType("filegroup", android.FileGroupFactory)

	ctx.RegisterModuleType("cc_library_static", cc.LibraryStaticFactory)

	ctx.RegisterModuleType("cc_prebuilt_library_static", cc.PrebuiltStaticLibraryFactory)

	ctx.RegisterModuleType("toolchain_library", cc.ToolchainLibraryFactory)

	ctx.RegisterModuleType("cc_library_headers", cc.LibraryHeaderFactory)

}
@@ -1264,7 +1252,7 @@ cc_library { 
    include_build_directory: false,

}

`,

		expectedErr: fmt.Errorf("Android.bp:16:1: module \"foo-lib\": nocrt is not supported for arch variants"),

		expectedErr: fmt.Errorf("module \"foo-lib\": nocrt is not supported for arch variants"),

	})

}

bp2build/cc_library_headers_conversion_test.go

+0 −12
Original line number Diff line number Diff line
@@ -26,17 +26,6 @@ const ( 
	soongCcLibraryHeadersPreamble = `

cc_defaults {

    name: "linux_bionic_supported",

}



toolchain_library {

    name: "libclang_rt.builtins-x86_64-android",

    defaults: ["linux_bionic_supported"],

    vendor_available: true,

    vendor_ramdisk_available: true,

    product_available: true,

    recovery_available: true,

    native_bridge_supported: true,

    src: "",

}`

)
@@ -68,7 +57,6 @@ func TestCcLibraryHeadersLoadStatement(t *testing.T) { 


func registerCcLibraryHeadersModuleTypes(ctx android.RegistrationContext) {

	cc.RegisterCCBuildComponents(ctx)

	ctx.RegisterModuleType("toolchain_library", cc.ToolchainLibraryFactory)

}



func runCcLibraryHeadersTestCase(t *testing.T, tc bp2buildTestCase) {

bp2build/cc_library_shared_conversion_test.go

+1 −2
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ const ( 


func registerCcLibrarySharedModuleTypes(ctx android.RegistrationContext) {

	cc.RegisterCCBuildComponents(ctx)

	ctx.RegisterModuleType("toolchain_library", cc.ToolchainLibraryFactory)

	ctx.RegisterModuleType("cc_library_headers", cc.LibraryHeaderFactory)

	ctx.RegisterModuleType("cc_library_static", cc.LibraryStaticFactory)

	ctx.RegisterModuleType("cc_library", cc.LibraryFactory)
@@ -422,7 +421,7 @@ cc_library_shared { 
    include_build_directory: false,

}

`,

		expectedErr: fmt.Errorf("Android.bp:16:1: module \"foo_shared\": nocrt is not supported for arch variants"),

		expectedErr: fmt.Errorf("module \"foo_shared\": nocrt is not supported for arch variants"),

	})

}

bp2build/cc_library_static_conversion_test.go

+0 −12
Original line number Diff line number Diff line
@@ -27,17 +27,6 @@ const ( 
	soongCcLibraryStaticPreamble = `

cc_defaults {

    name: "linux_bionic_supported",

}



toolchain_library {

    name: "libclang_rt.builtins-x86_64-android",

    defaults: ["linux_bionic_supported"],

    vendor_available: true,

    vendor_ramdisk_available: true,

    product_available: true,

    recovery_available: true,

    native_bridge_supported: true,

    src: "",

}`

)
@@ -69,7 +58,6 @@ func TestCcLibraryStaticLoadStatement(t *testing.T) { 


func registerCcLibraryStaticModuleTypes(ctx android.RegistrationContext) {

	cc.RegisterCCBuildComponents(ctx)

	ctx.RegisterModuleType("toolchain_library", cc.ToolchainLibraryFactory)

	ctx.RegisterModuleType("cc_library_headers", cc.LibraryHeaderFactory)

	ctx.RegisterModuleType("genrule", genrule.GenRuleFactory)

	// Required for system_shared_libs dependencies.