diff options
| author | Derek Morton <derek.j.morton@intel.com> | 2015-07-27 11:30:58 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-08-06 14:39:44 +0200 |
| commit | 1ae1d290bf0b0c0f6a1e8f81d47c2a4f5a51714a (patch) | |
| tree | d43ebd20b6e7ea8ecbf063e3329b79f65dc9d5dd | |
| parent | 995f2738adece4f7423f9ce9ac34ab0477844840 (diff) | |
benchmarks/Android.mk, tools/Android.mk: Fix android build error
Recently added tools / benckmarks have the same module name as
existing tests. Android does not allow duplicate modules. This
patch appends _benchmark and _tool to the module names used when
building benckmarks and tools to prevent clashes with tests of
the same name.
Signed-off-by: Derek Morton <derek.j.morton@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rw-r--r-- | benchmarks/Android.mk | 2 | ||||
| -rw-r--r-- | tools/Android.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk index 14fc0a7e..da11c441 100644 --- a/benchmarks/Android.mk +++ b/benchmarks/Android.mk @@ -17,7 +17,7 @@ define add_benchmark # Excessive complaining for established cases. Rely on the Linux version warnings. LOCAL_CFLAGS += -Wno-sign-compare - LOCAL_MODULE := $1 + LOCAL_MODULE := $1_benchmark LOCAL_MODULE_TAGS := optional LOCAL_STATIC_LIBRARIES := libintel_gpu_tools diff --git a/tools/Android.mk b/tools/Android.mk index 6617f287..0a196e46 100644 --- a/tools/Android.mk +++ b/tools/Android.mk @@ -25,7 +25,7 @@ define add_tool LOCAL_C_INCLUDES = $(LOCAL_PATH)/../lib LOCAL_C_INCLUDES += ${ANDROID_BUILD_TOP}/external/PRIVATE/drm/include/drm - LOCAL_MODULE := $1 + LOCAL_MODULE := $1_tool LOCAL_MODULE_TAGS := optional LOCAL_STATIC_LIBRARIES := libintel_gpu_tools |