diff options
| author | codeworkx <daniel.hillenbrand@codeworkx.de> | 2011-07-28 06:04:06 -0700 |
|---|---|---|
| committer | codeworkx <daniel.hillenbrand@codeworkx.de> | 2011-07-28 06:04:06 -0700 |
| commit | 38bf42bc3ab26b0aff8452f8a7c6813d9faa921f (patch) | |
| tree | 8f5af9e94cb2499463e4c4543c63158819b80cb4 /Android.mk | |
| parent | a8fb4a0032db58633914c3c2e3150aef28146a0b (diff) | |
| download | device_samsung_aries-common-38bf42bc3ab26b0aff8452f8a7c6813d9faa921f.zip device_samsung_aries-common-38bf42bc3ab26b0aff8452f8a7c6813d9faa921f.tar.gz device_samsung_aries-common-38bf42bc3ab26b0aff8452f8a7c6813d9faa921f.tar.bz2 | |
fix conflict
Change-Id: I0c5780f462900d0abc2b8dc045eab135f9ce6815
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -1,5 +1,3 @@ -ifeq ($(filter-out aries,$(TARGET_BOOTLOADER_BOARD_NAME)),) -ifeq ($(filter-out s5pv210,$(TARGET_BOARD_PLATFORM)),) +ifeq ($(TARGET_BOOTLOADER_BOARD_NAME),aries) include $(all-subdir-makefiles) endif -endif |