summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2013-07-30 16:47:56 -0700
committerStephen Hines <srhines@google.com>2013-07-31 17:54:37 -0700
commit4483ade6b23878e54a5c2932f04310f611420151 (patch)
tree191ab5ec0cc18d58500cfa8e1c53fd149541ed4b /build
parent583fc0990bcf055ceccfb31ad8d1f11715982bb8 (diff)
downloadandroid_development-4483ade6b23878e54a5c2932f04310f611420151.tar.gz
android_development-4483ade6b23878e54a5c2932f04310f611420151.tar.bz2
android_development-4483ade6b23878e54a5c2932f04310f611420151.zip
Add frameworks/rs and bcc_compat to windows SDK whitelist.
Change-Id: I81ff95e98bd827051336709d822f953295269d62
Diffstat (limited to 'build')
-rw-r--r--build/sdk-windows-x86.atree6
-rw-r--r--build/tools/windows_sdk.mk1
-rw-r--r--build/windows_sdk_whitelist.mk1
3 files changed, 6 insertions, 2 deletions
diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree
index 44b7fcba3..97f29a263 100644
--- a/build/sdk-windows-x86.atree
+++ b/build/sdk-windows-x86.atree
@@ -68,11 +68,13 @@ lib/libclang.dll strip build-tools/${PLATFORM_NAME}/libcl
#bcc not yet compiled on windows
rm build-tools/${PLATFORM_NAME}/libbcc.so
-#lib/libbcc.dll strip build-tools/${PLATFORM_NAME}/libbcc.dll
+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
+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
##############################################################################
diff --git a/build/tools/windows_sdk.mk b/build/tools/windows_sdk.mk
index aa5641b6b..9bd95093f 100644
--- a/build/tools/windows_sdk.mk
+++ b/build/tools/windows_sdk.mk
@@ -32,6 +32,7 @@ include $(TOPDIR)sdk/build/windows_sdk_tools.mk
# the topdir/development directory and are somehow platform-dependent.
WIN_TARGETS := \
aapt adb aidl \
+ bcc_compat \
etc1tool \
dexdump dmtracedump \
fastboot \
diff --git a/build/windows_sdk_whitelist.mk b/build/windows_sdk_whitelist.mk
index 4ef2aec0b..8d6ac8fb7 100644
--- a/build/windows_sdk_whitelist.mk
+++ b/build/windows_sdk_whitelist.mk
@@ -47,6 +47,7 @@ subdirs += \
frameworks/base \
frameworks/compile \
frameworks/native \
+ frameworks/rs \
system/core/adb \
system/core/fastboot \
system/core/libcutils \