diff options
| author | Jordan Justen <jordan.l.justen@intel.com> | 2021-01-09 16:10:26 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2021-01-15 09:19:45 -0800 |
| commit | 99ad50617acfe8ee1f5bafd77b12f051b4878155 (patch) | |
| tree | cf2291ebdf5daff693190b46827e6419c9e0c990 | |
| parent | 9a81b1820c9f27bac82c651d41ec163a86b3a36a (diff) | |
iris: Fix android build due to missing link to libmesa_iris_gen125
Reported-by: Yugang Fan
Fixes: cd3251d6baf ("intel/iris: Build gen 12.5")
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8426>
(cherry picked from commit fc1bd69bbd535b56fc701c54be404e250b7be856)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/iris/Android.mk | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index f749fe1e437..8f0194a8349 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -544,7 +544,7 @@ "description": "iris: Fix android build due to missing link to libmesa_iris_gen125", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "cd3251d6bafaae13d5a2cf52c917ef4517fe0130" }, diff --git a/src/gallium/drivers/iris/Android.mk b/src/gallium/drivers/iris/Android.mk index 507e68d0bf6..12a3afab7bd 100644 --- a/src/gallium/drivers/iris/Android.mk +++ b/src/gallium/drivers/iris/Android.mk @@ -170,7 +170,8 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ libmesa_iris_gen8 \ libmesa_iris_gen9 \ libmesa_iris_gen11 \ - libmesa_iris_gen12 + libmesa_iris_gen12 \ + libmesa_iris_gen125 include $(GALLIUM_COMMON_MK) include $(BUILD_STATIC_LIBRARY) |