diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-03-16 19:48:32 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2017-03-16 19:48:32 -0700 |
| commit | 615609854fc1531cedd8a52874d0fad57851b850 (patch) | |
| tree | 17bc565f536cccd3c3e6b834146fcb93e7a3e5e1 /cc/androidmk.go | |
| parent | 33edec5651391246f1a83bb660147d8290b14a1f (diff) | |
| download | build_soong-615609854fc1531cedd8a52874d0fad57851b850.tar.gz build_soong-615609854fc1531cedd8a52874d0fad57851b850.tar.bz2 build_soong-615609854fc1531cedd8a52874d0fad57851b850.zip | |
Revert "install *.so in different paths for their types"
This reverts commit 4c48f724e1b339128447ab1dafd656a9557557f5. 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
Diffstat (limited to 'cc/androidmk.go')
| -rw-r--r-- | cc/androidmk.go | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/cc/androidmk.go b/cc/androidmk.go index 0cd6faf6..f45fbbe5 100644 --- a/cc/androidmk.go +++ b/cc/androidmk.go @@ -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() |