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

Commit 57291b7a authored by Martijn Coenen's avatar Martijn Coenen
Browse files

Revert "Add more target-specific properties" 

Revert submission 15310714-remove_ndk_platform

Reason for revert: b/193935495
Reverted Changes:
Ia87b2881e:NDK backends supports both apps and platform
Ia32d82d6e:*-ndk.so libraries are added to the VNDK set.
Ie54b512a6:Add more target-specific properties

Change-Id: I6d39f9e9570f141c725ec657e59ace476490cd04
parent 43284a03

cc/compiler.go

+0 −9
Original line number Diff line number Diff line
@@ -189,11 +189,6 @@ type BaseCompilerProperties struct { 
			// variant of the C/C++ module.

			Cflags []string

		}

		Platform struct {

			// List of additional cflags that should be used to build the platform

			// variant of the C/C++ module.

			Cflags []string

		}

	}



	Proto struct {
@@ -315,7 +310,6 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps 
	CheckBadCompilerFlags(ctx, "product.cflags", compiler.Properties.Target.Product.Cflags)

	CheckBadCompilerFlags(ctx, "recovery.cflags", compiler.Properties.Target.Recovery.Cflags)

	CheckBadCompilerFlags(ctx, "vendor_ramdisk.cflags", compiler.Properties.Target.Vendor_ramdisk.Cflags)

	CheckBadCompilerFlags(ctx, "platform.cflags", compiler.Properties.Target.Platform.Cflags)



	esc := proptools.NinjaAndShellEscapeList
@@ -508,9 +502,6 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps 
	if ctx.inVendorRamdisk() {

		flags.Local.CFlags = append(flags.Local.CFlags, esc(compiler.Properties.Target.Vendor_ramdisk.Cflags)...)

	}

	if !ctx.useSdk() {

		flags.Local.CFlags = append(flags.Local.CFlags, esc(compiler.Properties.Target.Platform.Cflags)...)

	}



	// We can enforce some rules more strictly in the code we own. strict

	// indicates if this is code that we can be stricter with. If we have

cc/linker.go

+0 −15
Original line number Diff line number Diff line
@@ -111,10 +111,6 @@ type BaseLinkerProperties struct { 
			// product variant of the C/C++ module.

			Static_libs []string



			// list of ehader libs that only should be used to build vendor or product

			// variant of the C/C++ module.

			Header_libs []string



			// list of shared libs that should not be used to build vendor or

			// product variant of the C/C++ module.

			Exclude_shared_libs []string
@@ -183,14 +179,6 @@ type BaseLinkerProperties struct { 
			// in most cases the same libraries are available for the SDK and platform

			// variants.

			Shared_libs []string



			// list of ehader libs that only should be used to build platform variant of

			// the C/C++ module.

			Header_libs []string



			// list of shared libs that should not be used to build the platform variant

			// of the C/C++ module.

			Exclude_shared_libs []string

		}

		Apex struct {

			// list of shared libs that should not be used to build the apex variant of
@@ -312,7 +300,6 @@ func (linker *baseLinker) linkerDeps(ctx DepsContext, deps Deps) Deps { 
		deps.ReexportSharedLibHeaders = removeListFromList(deps.ReexportSharedLibHeaders, linker.Properties.Target.Vendor.Exclude_shared_libs)

		deps.StaticLibs = append(deps.StaticLibs, linker.Properties.Target.Vendor.Static_libs...)

		deps.StaticLibs = removeListFromList(deps.StaticLibs, linker.Properties.Target.Vendor.Exclude_static_libs)

		deps.HeaderLibs = append(deps.HeaderLibs, linker.Properties.Target.Vendor.Header_libs...)

		deps.HeaderLibs = removeListFromList(deps.HeaderLibs, linker.Properties.Target.Vendor.Exclude_header_libs)

		deps.ReexportStaticLibHeaders = removeListFromList(deps.ReexportStaticLibHeaders, linker.Properties.Target.Vendor.Exclude_static_libs)

		deps.WholeStaticLibs = removeListFromList(deps.WholeStaticLibs, linker.Properties.Target.Vendor.Exclude_static_libs)
@@ -362,8 +349,6 @@ func (linker *baseLinker) linkerDeps(ctx DepsContext, deps Deps) Deps { 


	if !ctx.useSdk() {

		deps.SharedLibs = append(deps.SharedLibs, linker.Properties.Target.Platform.Shared_libs...)

		deps.SharedLibs = removeListFromList(deps.SharedLibs, linker.Properties.Target.Platform.Exclude_shared_libs)

		deps.HeaderLibs = append(deps.HeaderLibs, linker.Properties.Target.Platform.Header_libs...)

	}



	deps.SystemSharedLibs = linker.overrideDefaultSharedLibraries(ctx)