summaryrefslogtreecommitdiffstats
path: root/src/mesa/Android.mk
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2012-11-07 16:33:39 -0800
committerChad Versace <[email protected]>2012-11-12 15:52:42 -0800
commit907844107252260c646aca361191ef7f121f3d23 (patch)
treecf9a5a54b804e852344541a096992943687e2a6a /src/mesa/Android.mk
parent0ef85357479a47c2bdd05df3b2183bc7bfa0ac6e (diff)
automake,android: Build program/ into a helper lib (v2)
While simplifying mesa/Makefile.am, the more important feature of this commit is allowing a file with the same name to appear in both main/ and program/. v2: [chadv] Add changes to Android makefiles. Reviewed-by: Kenneth Graunke <[email protected]> (v1) Signed-off-by: Chad Versace <[email protected]> (v2)
Diffstat (limited to 'src/mesa/Android.mk')
-rw-r--r--src/mesa/Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/Android.mk b/src/mesa/Android.mk
index 01055cc18e1..20f781948be 100644
--- a/src/mesa/Android.mk
+++ b/src/mesa/Android.mk
@@ -24,3 +24,5 @@ include $(LOCAL_PATH)/Android.mesa_gen_matypes.mk
include $(LOCAL_PATH)/Android.libmesa_glsl_utils.mk
include $(LOCAL_PATH)/Android.libmesa_dricore.mk
include $(LOCAL_PATH)/Android.libmesa_st_mesa.mk
+
+include $(LOCAL_PATH)/program/Android.mk