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

Commit 3d3b35c9 authored by Liz Kammer's avatar Liz Kammer
Browse files

Revert "Revert "bp2build: convert host & prebuilt header libraries"" 

This reverts commit 105deedf.

Reason for revert: Revert with forward fix

Change-Id: Ib0b6f6b1cbb011b4c5f2133e1cc15ec76ff29253
parent 105deedf

android/bazel.go

+2 −0
Original line number Diff line number Diff line
@@ -435,6 +435,8 @@ var ( 


		"abb",                     // depends on unconverted modules: libcmd, libbinder

		"adb",                     // depends on unconverted modules: AdbWinApi, libadb_host, libandroidfw, libapp_processes_protos_full, libfastdeploy_host, libopenscreen-discovery, libopenscreen-platform-impl, libusb, bin2c_fastdeployagent, AdbWinUsbApi

		"libadb_host",             // depends on unconverted modules: libopenscreen-discovery, libopenscreen-platform-impl, libusb, AdbWinApi

		"libfastdeploy_host",      // depends on unconverted modules: libandroidfw, libusb, AdbWinApi

		"linker",                  // depends on unconverted modules: libdebuggerd_handler_fallback

		"linker_reloc_bench_main", // depends on unconverted modules: liblinker_reloc_bench_*

		"versioner",               // depends on unconverted modules: libclang_cxx_host, libLLVM_host, of unsupported type llvm_host_prebuilt_library_shared

cc/cc.go

+1 −3
Original line number Diff line number Diff line
@@ -3476,9 +3476,7 @@ func (c *Module) ConvertWithBp2build(ctx android.TopDownMutatorContext) { 
				libraryBp2Build(ctx, c)

			}

		} else if !static && !shared {

			if !prebuilt {

			libraryHeadersBp2Build(ctx, c)

			}

		} else if static {

			if prebuilt {

				prebuiltLibraryStaticBp2Build(ctx, c)

cc/library.go

+2 −0
Original line number Diff line number Diff line
@@ -443,6 +443,8 @@ func LibraryHostStaticFactory() android.Module { 
	module, library := NewLibrary(android.HostSupported)

	library.BuildOnlyStatic()

	module.sdkMemberTypes = []android.SdkMemberType{staticLibrarySdkMemberType}

	module.bazelable = true

	module.bazelHandler = &ccLibraryBazelHandler{module: module}

	return module.Init()

}

cc/library_headers.go

+2 −0
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ func LibraryHeaderFactory() android.Module { 
func prebuiltLibraryHeaderFactory() android.Module {

	module, library := NewPrebuiltLibrary(android.HostAndDeviceSupported, "")

	library.HeaderOnly()

	module.bazelable = true

	module.bazelHandler = &ccLibraryBazelHandler{module: module}

	return module.Init()

}