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

Commit 61560985 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Revert "install *.so in different paths for their types" 

This reverts commit 4c48f724. It's
causing test failures, warnings and complaints, so backing it out and
we'll resolve those before putting it back in.

Bug: 33681361
Test: m -j
parent 33edec56

Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -146,8 +146,6 @@ bootstrap_go_package { 
        "cc/ndk_headers.go",

        "cc/ndk_library.go",

        "cc/ndk_sysroot.go",



        "cc/vndk_library.go",

    ],

    testSrcs: [

        "cc/cc_test.go",

android/config.go

+0 −4
Original line number Diff line number Diff line
@@ -497,7 +497,3 @@ func (c *deviceConfig) CoverageEnabledForPath(path string) bool { 
	}

	return coverage

}
 


func (c *deviceConfig) SameProcessHalDeps() []string {

	return append([]string(nil), c.config.ProductVariables.SameProcessHalDeps...)

}

android/variable.go

+0 −2
Original line number Diff line number Diff line
@@ -135,8 +135,6 @@ type productVariables struct { 
	ArtUseReadBarrier *bool `json:",omitempty"`



	BtConfigIncludeDir *string `json:",omitempty"`



	SameProcessHalDeps []string `json:",omitempty"`

}



func boolPtr(v bool) *bool {

cc/androidmk.go

+0 −8
Original line number Diff line number Diff line
@@ -156,14 +156,6 @@ func (library *libraryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.An 
	}

}



func (vndkLibrary *vndkExtLibraryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) {

	ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) error {

		fmt.Fprintln(w, "LOCAL_EXTENDS_MODULE := ", vndkLibrary.properties.Extends)

		return nil

	})

	vndkLibrary.libraryDecorator.AndroidMk(ctx, ret)

}



func (object *objectLinker) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) {

	ret.Custom = func(w io.Writer, name, prefix, moduleDir string) error {

		out := ret.OutputFile.Path()

cc/cc.go

+0 −15
Original line number Diff line number Diff line
@@ -163,9 +163,6 @@ type ModuleContextIntf interface { 
	vndk() bool

	selectedStl() string

	baseModuleName() string

	isNdk() bool

	isVndk() bool

	isSameProcessHal() bool

}



type ModuleContext interface {
@@ -408,18 +405,6 @@ func (ctx *moduleContextImpl) baseModuleName() string { 
	return ctx.mod.ModuleBase.BaseModuleName()

}



func (ctx *moduleContextImpl) isNdk() bool {

	return inList(ctx.baseModuleName(), ndkPrebuiltSharedLibraries)

}



func (ctx *moduleContextImpl) isVndk() bool {

	return config.IsVndkLibrary(ctx.baseModuleName())

}



func (ctx *moduleContextImpl) isSameProcessHal() bool {

	return inList(ctx.baseModuleName(), ctx.ctx.DeviceConfig().SameProcessHalDeps())

}



func newBaseModule(hod android.HostOrDeviceSupported, multilib android.Multilib) *Module {

	return &Module{

		hod:      hod,