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

am 257a315e: am 304c8070: am a783fe5f: Merge "Temporarily disable rs/bcc in win_sdk"

Browse Source 
* commit '257a315e72d8b878b71f1735c8174cfe69cde8c7':
  Temporarily disable rs/bcc in win_sdk
This commit is contained in:
Raphael Moll
2014-05-03 00:11:22 +00:00
committed by Android Git Automerger
parent 4718dfa473 257a315e72
commit df3914b04c
2 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
build/sdk-windows-x86.atree
View File

@@ -59,25 +59,26 @@ dalvik/dx/etc/dx.bat build-tools/${PLATFORM_NAME}/dx.ba
rm build-tools/${PLATFORM_NAME}/dexdump rm build-tools/${PLATFORM_NAME}/dexdump
bin/dexdump.exe strip build-tools/${PLATFORM_NAME}/dexdump.exe bin/dexdump.exe strip build-tools/${PLATFORM_NAME}/dexdump.exe
rm build-tools/${PLATFORM_NAME}/llvm-rs-cc ###RM(2014-05-02) Temporarily disable rs/bcc for the Windows SDK as we fix cross-compilation issues
bin/llvm-rs-cc.exe strip build-tools/${PLATFORM_NAME}/llvm-rs-cc.exe ###rm build-tools/${PLATFORM_NAME}/llvm-rs-cc
###bin/llvm-rs-cc.exe strip build-tools/${PLATFORM_NAME}/llvm-rs-cc.exe
rm build-tools/${PLATFORM_NAME}/libLLVM.so ###
lib/libLLVM.dll strip build-tools/${PLATFORM_NAME}/libLLVM.dll ###rm build-tools/${PLATFORM_NAME}/libLLVM.so
###lib/libLLVM.dll strip build-tools/${PLATFORM_NAME}/libLLVM.dll
rm build-tools/${PLATFORM_NAME}/libclang.so ###
lib/libclang.dll strip build-tools/${PLATFORM_NAME}/libclang.dll ###rm build-tools/${PLATFORM_NAME}/libclang.so
###lib/libclang.dll strip build-tools/${PLATFORM_NAME}/libclang.dll
#bcc not yet compiled on windows ###
####bcc not yet compiled on windows
rm build-tools/${PLATFORM_NAME}/libbcc.so ###
lib/libbcc.dll strip build-tools/${PLATFORM_NAME}/libbcc.dll ###rm build-tools/${PLATFORM_NAME}/libbcc.so
###lib/libbcc.dll strip build-tools/${PLATFORM_NAME}/libbcc.dll
rm build-tools/${PLATFORM_NAME}/libbcinfo.so ###
lib/libbcinfo.dll strip build-tools/${PLATFORM_NAME}/libbcinfo.dll ###rm build-tools/${PLATFORM_NAME}/libbcinfo.so
###lib/libbcinfo.dll strip build-tools/${PLATFORM_NAME}/libbcinfo.dll
rm build-tools/${PLATFORM_NAME}/bcc_compat ###
bin/bcc_compat.exe strip build-tools/${PLATFORM_NAME}/bcc_compat.exe ###rm build-tools/${PLATFORM_NAME}/bcc_compat
###bin/bcc_compat.exe strip build-tools/${PLATFORM_NAME}/bcc_compat.exe
rm build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld rm build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld
prebuilts/sdk/tools/windows/arm-linux-androideabi-ld.exe strip build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld.exe prebuilts/sdk/tools/windows/arm-linux-androideabi-ld.exe strip build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld.exe

17
build/tools/windows_sdk.mk
View File

@@ -32,17 +32,28 @@ include $(TOPDIR)sdk/build/windows_sdk_tools.mk
# the topdir/development directory and are somehow platform-dependent. # the topdir/development directory and are somehow platform-dependent.
WIN_TARGETS := \ WIN_TARGETS := \
aapt adb aidl \ aapt adb aidl \
bcc_compat \
etc1tool \ etc1tool \
dexdump dmtracedump \ dexdump dmtracedump \
fastboot \ fastboot \
hprof-conv \ hprof-conv \
llvm-rs-cc \
prebuilt \ prebuilt \
sqlite3 \ sqlite3 \
zipalign \ zipalign \
$(WIN_SDK_TARGETS) $(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 # This is the list of *Linux* build tools that we need
# in order to be able to make the WIN_TARGETS. They are # in order to be able to make the WIN_TARGETS. They are
# build prerequisites. # build prerequisites.