LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am c39a26b6: Fix bad automatic dependency computations

Browse Source 
Merge commit 'c39a26b6f52d189a0bec85cbe168006454b14a9b'

* commit 'c39a26b6f52d189a0bec85cbe168006454b14a9b':
  Fix bad automatic dependency computations
  Remove duplicate initialization in AdtPlugin.
This commit is contained in:
David 'Digit' Turner
2009-05-14 15:39:58 -07:00
committed by The Android Open Source Project
parent 21a86db6e5 c39a26b6f5
commit 5d83352be2
3 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ndk/build/core/build-binary.mk
View File

@@ -120,5 +120,5 @@ $(foreach src,$(c_sources), $(call compile-c-source,$(src)))
$(foreach src,$(s_sources), $(call compile-s-source,$(src))) $(foreach src,$(s_sources), $(call compile-s-source,$(src)))
$(foreach src,$(cpp_sources), $(call compile-cpp-source,$(src))) $(foreach src,$(cpp_sources), $(call compile-cpp-source,$(src)))
LOCAL_DEPENDENCY_DIRS := $(sort $(LOCAL_DEPENDENCY_DIRS)) ALL_DEPENDENCY_DIRS += $(sort $(LOCAL_DEPENDENCY_DIRS))
CLEAN_OBJS_DIRS += $(LOCAL_OBJS_DIR) CLEAN_OBJS_DIRS += $(LOCAL_OBJS_DIR)

6
ndk/build/core/main.mk
View File

@@ -222,7 +222,7 @@ ANDROID_MK_INCLUDED := \
# generated during the build. It will be updated by build scripts # generated during the build. It will be updated by build scripts
# when module definitions are parsed. # when module definitions are parsed.
# #
DEPENDENCY_DIRS := ALL_DEPENDENCY_DIRS :=
# this is the list of all generated files that we would need to clean # this is the list of all generated files that we would need to clean
ALL_HOST_EXECUTABLES := ALL_HOST_EXECUTABLES :=
@@ -290,5 +290,5 @@ clean-config:
$(hide) rm -f $(CONFIG_MAKE) $(CONFIG_H) $(hide) rm -f $(CONFIG_MAKE) $(CONFIG_H)
# include dependency information # include dependency information
DEPENDENCY_DIRS := $(sort $(DEPENDENCY_DIRS)) ALL_DEPENDENCY_DIRS := $(sort $(ALL_DEPENDENCY_DIRS))
-include $(wildcard $(DEPENDENCY_DIRS:%=%/*.d)) -include $(wildcard $(ALL_DEPENDENCY_DIRS:%=%/*.d))

16
tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java
View File

@@ -1122,22 +1122,6 @@ public class AdtPlugin extends AbstractUIPlugin {
"/icons/android.png"); //$NON-NLS-1$ "/icons/android.png"); //$NON-NLS-1$
sAndroidLogo = sAndroidLogoDesc.createImage(); sAndroidLogo = sAndroidLogoDesc.createImage();
// get the stream to write in the android console.
MessageConsole androidConsole = AdtPlugin.getDefault().getAndroidConsole();
mAndroidConsoleStream = androidConsole.newMessageStream();
mAndroidConsoleErrorStream = androidConsole.newMessageStream();
mRed = new Color(getDisplay(), 0xFF, 0x00, 0x00);
// because this can be run, in some cases, by a non ui thread, and beccause
// changing the console properties update the ui, we need to make this change
// in the ui thread.
getDisplay().asyncExec(new Runnable() {
public void run() {
mAndroidConsoleErrorStream.setColor(mRed);
}
});
// Add a resource listener to handle compiled resources. // Add a resource listener to handle compiled resources.
IWorkspace ws = ResourcesPlugin.getWorkspace(); IWorkspace ws = ResourcesPlugin.getWorkspace();
mResourceMonitor = ResourceMonitor.startMonitoring(ws); mResourceMonitor = ResourceMonitor.startMonitoring(ws);