OSDN Git Service

Remove the default sdk.atree if custom one is set.
authorYing Wang <wangying@google.com>
Tue, 18 Feb 2014 22:29:59 +0000 (14:29 -0800)
committerYing Wang <wangying@google.com>
Tue, 18 Feb 2014 22:33:25 +0000 (14:33 -0800)
Change-Id: I5d20b030db5ef29d7ff6eb64a0a1e11a4283e85d

core/Makefile

index 6956c22..7089f6d 100644 (file)
@@ -1554,7 +1554,6 @@ endif
 
 sdk_atree_files := \
        $(atree_dir)/sdk.exclude.atree \
-       $(atree_dir)/sdk.atree \
        $(atree_dir)/sdk-$(HOST_OS)-$(HOST_ARCH).atree \
        $(sdk_tools_atree_files)
 
@@ -1583,7 +1582,7 @@ deps := \
        $(INSTALLED_SDK_BUILD_PROP_TARGET) \
        $(INSTALLED_BUILD_PROP_TARGET) \
        $(ATREE_FILES) \
-       $(atree_dir)/sdk.atree \
+       $(sdk_atree_files) \
        $(sdk_tools_atree_files) \
        $(HOST_OUT_EXECUTABLES)/atree \
        $(HOST_OUT_EXECUTABLES)/line_endings