am acbbba88: am d1b68863: Merge "Add etc1tool to Windows SDK." into eclair
Merge commit 'acbbba88fb2a2e43b63cb83675ea368c47621ca8'
* commit 'acbbba88fb2a2e43b63cb83675ea368c47621ca8':
Add etc1tool to Windows SDK.
diff --git a/core/main.mk b/core/main.mk
index 2471e46..134e844 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -350,6 +350,11 @@
ifeq ($(SDK_ONLY),true)
+# ----- SDK for Windows ------
+# These configure the build targets that are available for the SDK under Cygwin.
+# The first section defines all the C/C++ tools that can be compiled under Cygwin,
+# the second section defines all the Java ones (assuming javac is available.)
+
subdirs := \
prebuilt \
build/libs/host \
@@ -359,6 +364,7 @@
dalvik/tools/dmtracedump \
dalvik/tools/hprof-conv \
development/tools/line_endings \
+ development/tools/etc1tool \
sdk/emulator/mksdcard \
sdk/sdklauncher \
development/host \
@@ -370,6 +376,7 @@
frameworks/base/libs/utils \
frameworks/base/tools/aapt \
frameworks/base/tools/aidl \
+ frameworks/base/opengl/libs \
system/core/adb \
system/core/fastboot \
system/core/libcutils \