diff options
| author | Narayan Kamath <narayan@google.com> | 2014-10-02 14:35:25 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-10-02 14:35:25 +0100 |
| commit | d515d6c5c4979d5b4856f926187b834cf6b3cd35 (patch) | |
| tree | f7baabbfb9ba19fb53d01a2a1a8aa79c30a2ed34 /build/tools | |
| parent | 991459db7adec0626bfa2d5106f9cc548e007292 (diff) | |
| parent | 3f2caae206b5d44e83d44b6753ac736171fab9cb (diff) | |
| download | android_development-d515d6c5c4979d5b4856f926187b834cf6b3cd35.tar.gz android_development-d515d6c5c4979d5b4856f926187b834cf6b3cd35.tar.bz2 android_development-d515d6c5c4979d5b4856f926187b834cf6b3cd35.zip | |
resolved conflicts for merge of 3f2caae2 to lmp-mr1-dev-plus-aosp
Change-Id: If9f3110e57131f13c55a87169dbdc2cd8cf74660
Diffstat (limited to 'build/tools')
| -rw-r--r-- | build/tools/windows_sdk.mk | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/build/tools/windows_sdk.mk b/build/tools/windows_sdk.mk index cd1a9d87c..3581c6d88 100644 --- a/build/tools/windows_sdk.mk +++ b/build/tools/windows_sdk.mk @@ -33,28 +33,17 @@ include $(TOPDIR)sdk/build/windows_sdk_tools.mk WIN_TARGETS := \ aapt adb aidl \ aprotoc \ + bcc_compat \ etc1tool \ dexdump dmtracedump \ fastboot \ hprof-conv \ + llvm-rs-cc \ prebuilt \ sqlite3 \ zipalign \ $(WIN_SDK_TARGETS) -###RM(2014-05-02) full list of WIN_TARGS, including bcc/rs that are temporarily deactivated -###WIN_TARGETS := \ -### aapt adb aidl \ -### bcc_compat \ -### etc1tool \ -### dexdump dmtracedump \ -### fastboot \ -### hprof-conv \ -### llvm-rs-cc \ -### prebuilt \ -### sqlite3 \ -### zipalign \ -### $(WIN_SDK_TARGETS) -### + # This is the list of *Linux* build tools that we need # in order to be able to make the WIN_TARGETS. They are # build prerequisites. |