diff options
| author | Raphael Moll <raphael@google.com> | 2013-03-14 12:41:16 -0700 |
|---|---|---|
| committer | Raphael Moll <raphael@google.com> | 2013-03-14 12:42:04 -0700 |
| commit | cdfb5bac3a5721b895cea4789ac2384ff6546992 (patch) | |
| tree | c34f6906b685bb6d1a9c73def341373b2937be40 /core/main.mk | |
| parent | 6e2d53a5cdcc99e3927ae5db537dd74eb5474daf (diff) | |
| parent | a3aea5b6eba3007b02b6a44d8eccb6883037278d (diff) | |
| download | build-cdfb5bac3a5721b895cea4789ac2384ff6546992.zip build-cdfb5bac3a5721b895cea4789ac2384ff6546992.tar.gz build-cdfb5bac3a5721b895cea4789ac2384ff6546992.tar.bz2 | |
resolved conflicts for merge of a3aea5b6 to jb-mr2-dev
Change-Id: I4ff0adb3f9d9b5ae293c4903569e871ac5f2e9ae
Diffstat (limited to 'core/main.mk')
| -rw-r--r-- | core/main.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/main.mk b/core/main.mk index 7f3d706..e671722 100644 --- a/core/main.mk +++ b/core/main.mk @@ -427,8 +427,8 @@ SDK_ONLY := true endif ifeq ($(SDK_ONLY),true) -include $(TOPDIR)sdk/build/sdk_only_whitelist.mk -include $(TOPDIR)development/build/sdk_only_whitelist.mk +include $(TOPDIR)sdk/build/windows_sdk_whitelist.mk +include $(TOPDIR)development/build/windows_sdk_whitelist.mk # Exclude tools/acp when cross-compiling windows under linux ifeq ($(findstring Linux,$(UNAME)),) |