diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2008-12-19 08:15:15 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2008-12-19 08:15:15 -0800 |
| commit | 77d0c65b950570edd5241a8f2ebecfc3acbc5135 (patch) | |
| tree | 8e3d3e2ca15d3bd038de6e22e1f00f31aad1406f /libpixelflinger/Android.mk | |
| parent | 829dd45fe9556dac5996969c30b90f1be6c47c47 (diff) | |
| parent | 35237d135807af84bf9b0e5b8d7f8633e58db6f5 (diff) | |
| download | system_core-77d0c65b950570edd5241a8f2ebecfc3acbc5135.tar.gz system_core-77d0c65b950570edd5241a8f2ebecfc3acbc5135.tar.bz2 system_core-77d0c65b950570edd5241a8f2ebecfc3acbc5135.zip | |
Merge commit 'remotes/korg/cupcake'
Conflicts:
init/devices.c
logwrapper/logwrapper.c
mountd/AutoMount.c
Diffstat (limited to 'libpixelflinger/Android.mk')
| -rw-r--r-- | libpixelflinger/Android.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libpixelflinger/Android.mk b/libpixelflinger/Android.mk index a8e5ee4e..6edc56fe 100644 --- a/libpixelflinger/Android.mk +++ b/libpixelflinger/Android.mk @@ -85,3 +85,6 @@ ifeq ($(TARGET_ARCH),arm) LOCAL_WHOLE_STATIC_LIBRARIES := libpixelflinger_armv6 endif include $(BUILD_STATIC_LIBRARY) + + +include $(call all-makefiles-under,$(LOCAL_PATH)) |