diff options
| author | Jayant Chowdhary <jchowdhary@google.com> | 2018-03-08 11:00:50 -0800 |
|---|---|---|
| committer | Jayant Chowdhary <jchowdhary@google.com> | 2018-03-12 16:56:03 -0700 |
| commit | 070f60548581d2da66ad3fb91df5bd4d88cceb26 (patch) | |
| tree | 3c9266acb69f91756981ddd29bc6adb519435616 /android/paths.go | |
| parent | fb7f985c846d3a1ddcf8b5691620e0eb764fed5e (diff) | |
| download | build_soong-070f60548581d2da66ad3fb91df5bd4d88cceb26.tar.gz build_soong-070f60548581d2da66ad3fb91df5bd4d88cceb26.tar.bz2 build_soong-070f60548581d2da66ad3fb91df5bd4d88cceb26.zip | |
Consider binder bitness while looking for abi references.
Binder bitness does not always correlate directly with primary arch, as
assumed earlier. For example: it is possible to have devices with
primary arch 'arm' and use 64 bit binder.
Bug: 74362434
Test: utils/create_reference_dumps.py;
m -j vndk_package for aosp_arm64_ab, aosp_arm_ab invokes
header-abi-diff on both arm and arm64 arches.
Test: mm -j64 in system/libhwbinder on troublesome internal target.
Merged-In: Iea0a24b57cdb3033e25b6fe126c5d5d717f45b4e
Change-Id: Iea0a24b57cdb3033e25b6fe126c5d5d717f45b4e
(cherry picked from commit 34ce67d454038e1d8b11e45c9676f2229fd3e21a)
Diffstat (limited to 'android/paths.go')
| -rw-r--r-- | android/paths.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/android/paths.go b/android/paths.go index cf5544df..3605dcf4 100644 --- a/android/paths.go +++ b/android/paths.go @@ -800,8 +800,8 @@ func PathForVndkRefAbiDump(ctx ModuleContext, version, fileName string, vndkOrNd if len(arches) == 0 { panic("device build with no primary arch") } - primary_arch := arches[0].ArchType.String() - refDumpFileStr := "prebuilts/abi-dumps/" + vndkOrNdkDir + "/" + version + "/" + primary_arch + "/" + + binderBitness := ctx.DeviceConfig().BinderBitness() + refDumpFileStr := "prebuilts/abi-dumps/" + vndkOrNdkDir + "/" + version + "/" + binderBitness + "/" + archNameAndVariant + "/" + sourceOrBinaryDir + "/" + fileName + ext return ExistentPathForSource(ctx, refDumpFileStr) } |