summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames W. Mills2012-04-18 19:10:19 -0500
committerJames W. Mills2012-04-18 19:22:52 -0500
commit6b9763afd8e6af52c35b1918454b617f8e921ba6 (patch)
treed86109eb488e025c809449d020ed52db8718b51c /Android.mk
parent16070f5f76b980edc7e0ed7653887e38aed84125 (diff)
downloaddevice-ti-proprietary-open-6b9763afd8e6af52c35b1918454b617f8e921ba6.tar.gz
device-ti-proprietary-open-6b9763afd8e6af52c35b1918454b617f8e921ba6.tar.xz
device-ti-proprietary-open-6b9763afd8e6af52c35b1918454b617f8e921ba6.zip
Move subdir include to top of Android.mk
Having the Android.mk inclusion at the bottom of the Android.mk is causing it to be ignored, which meand SGX/wlan/etc are no longer installed. Moving it to the top makes it work, and the subsequent ducati definition works as well. Change-Id: Idcbce941b9e3b60906421b0cf944160d41ac027b Signed-off-by: James W. Mills <jameswmills@ti.com>
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 009ccae..a1a60c4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -2,6 +2,8 @@ LOCAL_PATH := $(my-dir)
2$(hide $(shell $(LOCAL_PATH)/untar.sh $(LOCAL_PATH)/omap4 sgx $(LOCAL_PATH)/omap4/sgx.tgz)) 2$(hide $(shell $(LOCAL_PATH)/untar.sh $(LOCAL_PATH)/omap4 sgx $(LOCAL_PATH)/omap4/sgx.tgz))
3$(hide $(shell $(LOCAL_PATH)/untar.sh $(LOCAL_PATH)/wl12xx wpan $(LOCAL_PATH)/wl12xx/wpan.tgz)) 3$(hide $(shell $(LOCAL_PATH)/untar.sh $(LOCAL_PATH)/wl12xx wpan $(LOCAL_PATH)/wl12xx/wpan.tgz))
4 4
5include $(call all-subdir-makefiles)
6
5# Install Ducati from the TGZ defined in the device-inherited mk file 7# Install Ducati from the TGZ defined in the device-inherited mk file
6############################################# 8#############################################
7ifneq ($(DUCATI_TGZ),) 9ifneq ($(DUCATI_TGZ),)
@@ -29,5 +31,3 @@ $(LOCAL_BUILT_MODULE) : $(ti-ducati.untarred_timestamp) | $(ACP)
29 $(hide) $(ACP) -fp $(PRIVATE_SRC) $@ 31 $(hide) $(ACP) -fp $(PRIVATE_SRC) $@
30endif 32endif
31############################################# 33#############################################
32
33include $(call all-subdir-makefiles)