diff options
author | Emil Velikov | 2018-03-20 12:32:37 -0500 |
---|---|---|
committer | Emil Velikov | 2018-03-28 11:08:32 -0500 |
commit | 4dfa458979c345ea5eb46749f545d78c09e3f244 (patch) | |
tree | d3e8adae4eb9b8901eed8e68ad9068312951e829 /intel | |
parent | bb0fd5f3b30141e2049a31f9ccd3f806645b21e0 (diff) | |
download | external-libgbm-4dfa458979c345ea5eb46749f545d78c09e3f244.tar.gz external-libgbm-4dfa458979c345ea5eb46749f545d78c09e3f244.tar.xz external-libgbm-4dfa458979c345ea5eb46749f545d78c09e3f244.zip |
Revert "libdrm: intel/Android.mk: Filter libdrm_intel library requirements on x86/x86_64"
This reverts commit ed07718ae7bab596297abf210bb0c37c6dba58ed.
The commit added a guard since libpciaccess may be missing on some
setups. As of last commit there are no traces of the project, from
Android POV.
Hence, we can revert this workaround - which caused similar breakage to
the one it's trying to fix. This time in Mesa.
Cc: Rob Herring <rob.herring@linaro.org>
Acked-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'intel')
-rw-r--r-- | intel/Android.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/intel/Android.mk b/intel/Android.mk index dd881688..f45312dd 100644 --- a/intel/Android.mk +++ b/intel/Android.mk | |||
@@ -21,7 +21,6 @@ | |||
21 | # IN THE SOFTWARE. | 21 | # IN THE SOFTWARE. |
22 | # | 22 | # |
23 | 23 | ||
24 | ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64)) | ||
25 | LOCAL_PATH := $(call my-dir) | 24 | LOCAL_PATH := $(call my-dir) |
26 | include $(CLEAR_VARS) | 25 | include $(CLEAR_VARS) |
27 | 26 | ||
@@ -37,4 +36,3 @@ LOCAL_SHARED_LIBRARIES := \ | |||
37 | 36 | ||
38 | include $(LIBDRM_COMMON_MK) | 37 | include $(LIBDRM_COMMON_MK) |
39 | include $(BUILD_SHARED_LIBRARY) | 38 | include $(BUILD_SHARED_LIBRARY) |
40 | endif | ||