diff options
| author | Narayan Kamath <narayan@google.com> | 2014-06-17 11:11:35 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-06-17 11:11:35 +0100 |
| commit | 9d62dbc53278e1a380053178ead373619eca4a32 (patch) | |
| tree | 6eb94599964c939301747102856f1a020fbc8382 /core/config.mk | |
| parent | b75b32830c2e99dae90ab1915e74c1b3ec592e39 (diff) | |
| parent | b60ccd667200d34808f253bdf8d56ea18834006b (diff) | |
| download | build-9d62dbc53278e1a380053178ead373619eca4a32.zip build-9d62dbc53278e1a380053178ead373619eca4a32.tar.gz build-9d62dbc53278e1a380053178ead373619eca4a32.tar.bz2 | |
resolved conflicts for merge of b60ccd66 to master
Change-Id: I731af090c472d70a6c0627cef87239dc6df91645
Diffstat (limited to 'core/config.mk')
| -rw-r--r-- | core/config.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/config.mk b/core/config.mk index d56f1f8..e444635 100644 --- a/core/config.mk +++ b/core/config.mk @@ -254,7 +254,7 @@ endif # # Note that this assumes that the 2ND_CPU_ABI for a 64 bit target # is always 32 bits. If this isn't the case, these variables should -# be overriden in the boarc configuration. +# be overriden in the board configuration. ifeq (,$(TARGET_CPU_ABI_LIST_64_BIT)) ifeq (true|true,$(TARGET_IS_64_BIT)|$(TARGET_SUPPORTS_64_BIT_APPS)) TARGET_CPU_ABI_LIST_64_BIT := $(TARGET_CPU_ABI) $(TARGET_CPU_ABI2) |