diff options
| author | 2016-08-29 15:53:15 -0700 | |
|---|---|---|
| committer | 2016-08-29 16:02:05 -0700 | |
| commit | 1d577e25a7aa7a761bd8fcbc6ea9ca349a8f4704 (patch) | |
| tree | 6aff0d34142403adfa03b774b9e2a13537546936 /cc/androidmk.go | |
| parent | 15690c02d64088716c6e8cec963819f2cd997593 (diff) | |
Expose module suffixes to Make
These had only been exposed for shared libraries.
Also fixes testDecorator to not have two baseInstallers both being
written out to the Android.mk.
Bug: 31158868
Test: manual diff of out/soong/Android-aosp_flounder.mk
Test: Verify installed windows binaries end in .exe
Change-Id: I2bded5fb090117d48ade575b4438e0dedd2e3763
Diffstat (limited to 'cc/androidmk.go')
| -rw-r--r-- | cc/androidmk.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cc/androidmk.go b/cc/androidmk.go index d4965d8d6..831c0fbce 100644 --- a/cc/androidmk.go +++ b/cc/androidmk.go @@ -100,8 +100,7 @@ func (library *libraryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.An fmt.Fprintln(w, "LOCAL_EXPORT_C_INCLUDE_DIRS :=", strings.Join(exportedIncludes, " ")) } - fmt.Fprintln(w, "LOCAL_MODULE_SUFFIX := "+outputFile.Ext()) - fmt.Fprintln(w, "LOCAL_BUILT_MODULE_STEM := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX)") + fmt.Fprintln(w, "LOCAL_BUILT_MODULE_STEM := $(LOCAL_MODULE)"+outputFile.Ext()) fmt.Fprintln(w, "LOCAL_SYSTEM_SHARED_LIBRARIES :=") @@ -141,12 +140,10 @@ func (binary *binaryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.Andr func (benchmark *benchmarkDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) { ctx.subAndroidMk(ret, benchmark.binaryDecorator) - ctx.subAndroidMk(ret, benchmark.baseInstaller) } func (test *testBinary) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) { ctx.subAndroidMk(ret, test.binaryDecorator) - ctx.subAndroidMk(ret, test.baseInstaller) if Bool(test.Properties.Test_per_src) { ret.SubName = "_" + test.binaryDecorator.Properties.Stem } @@ -191,6 +188,7 @@ func (installer *baseInstaller) AndroidMk(ctx AndroidMkContext, ret *android.And path := installer.path.RelPathString() dir, file := filepath.Split(path) stem := strings.TrimSuffix(file, filepath.Ext(file)) + fmt.Fprintln(w, "LOCAL_MODULE_SUFFIX := "+filepath.Ext(file)) fmt.Fprintln(w, "LOCAL_MODULE_PATH := $(OUT_DIR)/"+filepath.Clean(dir)) fmt.Fprintln(w, "LOCAL_MODULE_STEM := "+stem) if len(installer.Properties.Symlinks) > 0 { |