diff options
| author | Jiyong Park <jiyong@google.com> | 2019-05-01 21:01:23 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2019-05-03 08:41:35 +0900 |
| commit | 6c5318266d116972c3418dad986fb4b05e766702 (patch) | |
| tree | e1f810dfdf60fd8b1ffe86d47d504abe5905e911 /android | |
| parent | 363360c963116df431da33d45b1a2b7abab64c28 (diff) | |
| download | build_soong-6c5318266d116972c3418dad986fb4b05e766702.tar.gz build_soong-6c5318266d116972c3418dad986fb4b05e766702.tar.bz2 build_soong-6c5318266d116972c3418dad986fb4b05e766702.zip | |
Emit LOCAL_MODULE_TARGET_ARCH for prebuilt_etc
Absense of the flag causes problem when prebuilt_etc is configured with
compile_multilib.
Bug: 130138217
Test: choosecombo to aosp_x86_64 and build
test_com.android.media.swcodec
Check that the test APEX has 32-bit artifacts.
Merged-In: Idd28443d129ff70053295015e69328a8fa3eca47
Change-Id: I6b90668d6effc9f82f7cf3a958d4964e8f06ac8e
Diffstat (limited to 'android')
| -rw-r--r-- | android/prebuilt_etc.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/android/prebuilt_etc.go b/android/prebuilt_etc.go index 2a3e07e3..8f23d78e 100644 --- a/android/prebuilt_etc.go +++ b/android/prebuilt_etc.go @@ -158,6 +158,7 @@ func (p *PrebuiltEtc) AndroidMk() AndroidMkData { fmt.Fprintln(w, "LOCAL_INSTALLED_MODULE_STEM :=", p.outputFilePath.Base()) fmt.Fprintln(w, "LOCAL_UNINSTALLABLE_MODULE :=", !p.Installable()) fmt.Fprintln(w, "LOCAL_REQUIRED_MODULES :=", strings.Join(data.Required, " ")) + fmt.Fprintln(w, "LOCAL_MODULE_TARGET_ARCH :=", p.Arch().ArchType.String()) if p.additionalDependencies != nil { fmt.Fprint(w, "LOCAL_ADDITIONAL_DEPENDENCIES :=") for _, path := range *p.additionalDependencies { |