diff options
author | Ying Wang <wangying@google.com> | 2012-09-20 15:46:06 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-20 15:46:06 -0700 |
commit | d6ff065b6940770713fa4f802eb97d0125c31b28 (patch) | |
tree | 91deac891cde360df2bae6ad155fcb29cb01b4f0 /core/config.mk | |
parent | b8a35577d72ee4463c16c1200d73a1e770fe30d4 (diff) | |
parent | a49a4d3461fba91e9da0049863f812ddb8ffc8e2 (diff) | |
download | build-d6ff065b6940770713fa4f802eb97d0125c31b28.zip build-d6ff065b6940770713fa4f802eb97d0125c31b28.tar.gz build-d6ff065b6940770713fa4f802eb97d0125c31b28.tar.bz2 |
am a49a4d34: am 7884dfc6: Merge "Move AndroidConfig.h from system/core to the build project." into jb-mr1-dev
* commit 'a49a4d3461fba91e9da0049863f812ddb8ffc8e2':
Move AndroidConfig.h from system/core to the build project.
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 e69c863..3924689 100644 --- a/core/config.mk +++ b/core/config.mk @@ -222,7 +222,7 @@ TARGET_CPU_ABI2 := $(strip $(TARGET_CPU_ABI2)) # $(1): os/arch define select-android-config-h -system/core/include/arch/$(1)/AndroidConfig.h +build/core/combo/include/arch/$(1)/AndroidConfig.h endef combo_target := HOST_ |